Andrey Kumanyaev
ea6f46cb87
Team members public section
2013-01-24 22:31:24 +02:00
Andrey Kumanyaev
911f6eb106
merge into public
2013-01-24 22:31:24 +02:00
Andrey Kumanyaev
7d3efec7d1
Add ability to teams
2013-01-24 22:31:24 +02:00
Andrey Kumanyaev
695becc4cb
Add teams into Public sections
2013-01-24 22:31:23 +02:00
Andrey Kumanyaev
82499a4cbf
Admin teams section added
2013-01-24 22:31:23 +02:00
Andrey Kumanyaev
8a86fe7bb0
Added UserTeam core models (team and m-t-m relationships) and updated other models
2013-01-24 22:31:23 +02:00
Dmitriy Zaporozhets
f6c482c06f
User can create group
2013-01-24 17:47:09 +02:00
Dmitriy Zaporozhets
62cb514070
Merge pull request #2712 from aus/patch-1
...
Revise projects/new text
2013-01-23 10:12:28 -08:00
Chris Waguespack
8ec36ca056
Update Markdown example to use username
...
Update the Markdown example in the Help pages to use username instead of user.
2013-01-23 09:58:38 -06:00
Austin Robertson
d3c34ef8af
Revise projects/new text
...
The previous text implied projects can only be private. Projects can now be private or public.
2013-01-23 08:47:19 -06:00
Dmitriy Zaporozhets
96d97c4857
Fix routing. Finalize user show page
2013-01-22 19:45:13 +02:00
Dmitriy Zaporozhets
70690e1971
base implementation
2013-01-22 19:05:01 +02:00
Dmitriy Zaporozhets
e0fb0703c4
Merge branch 'features/help_with_index'
2013-01-22 17:58:40 +02:00
Dmitriy Zaporozhets
2be107d0d9
Help with index
2013-01-22 17:58:09 +02:00
Valeriy Sizov
745c0dfa57
remove length of issue content
...
according to #2677
2013-01-22 17:15:22 +02:00
Valeriy Sizov
69ec189ad2
remove length of snippet content
2013-01-22 17:10:00 +02:00
Dmitriy Zaporozhets
ee43e9248c
Add warning if user own projet but not in team. Also show loading when merge MR
2013-01-21 15:05:18 +02:00
Dmitriy Zaporozhets
d1e63c7df2
Reporter cant create MR. Show user authorized projects in Admin area
2013-01-21 14:16:48 +02:00
Alex Denisov
e78e067204
Render empty string instead of nil
2013-01-21 09:48:25 +00:00
Riyad Preukschas
d9270337c1
Update text on help#public_access page
2013-01-19 15:27:03 +01:00
Riyad Preukschas
607a38dd00
Fix public/projects#index page
2013-01-19 15:27:00 +01:00
Riyad Preukschas
75447fb044
Redo help#help_pages partial
2013-01-19 15:26:40 +01:00
Riyad Preukschas
8a5b770c36
Reorder help routes
2013-01-19 15:26:23 +01:00
Riyad Preukschas
bba88e84a9
Fix public layout
2013-01-19 15:24:56 +01:00
Riyad Preukschas
8db80f1f6d
Rename help#public_area to help#public_access
2013-01-19 15:24:51 +01:00
Riyad Preukschas
359703c696
Fix public cloning option text on projects#edit page
2013-01-19 15:24:37 +01:00
Riyad Preukschas
7e6a5800b6
Fix text on groups#show page
2013-01-19 15:24:07 +01:00
Dmitriy Zaporozhets
cfe8983272
Remove link to non-existing page. Fixes #2620
2013-01-19 12:50:44 +02:00
Dmitriy Zaporozhets
3a1022e381
Increase Issue description size to 10k. Fixes #2545
2013-01-19 12:09:23 +02:00
Dmitriy Zaporozhets
569a88a456
raise exception if gitolite is broken
2013-01-19 11:58:36 +02:00
Dmitriy Zaporozhets
af7dcda1cb
Fix project creation
2013-01-18 22:23:11 +02:00
Dmitriy Zaporozhets
6f05ea4f6e
Improve CreateContext call. Fixed test
2013-01-18 20:21:13 +02:00
GitLab
232d61d598
Refactor project creation. Added logout link to profile page
2013-01-17 17:35:57 +02:00
Marin Jankovski
296cdd591f
Add optional signup.
2013-01-18 11:57:31 +01:00
Dmitriy Zaporozhets
bf753e99e7
Improve link to comment targets on dashboard
2013-01-17 22:54:02 +02:00
Dmitriy Zaporozhets
4bb1664aae
Merge pull request #2649 from tjeezy/patch-1
...
Eliminate horizontal shifting on diff body heights
2013-01-17 12:38:58 -08:00
Dmitriy Zaporozhets
2e9c0e2b47
switch to use link_to_member to prevent 500 if user is a project owner but does not have membership and leave comment
2013-01-17 22:35:45 +02:00
TJ Koblentz
f65713dfa6
Eliminate horizontal shifting on diff body heights
2013-01-17 11:35:35 -08:00
Dmitriy Zaporozhets
b08bb20979
Fix assign-to-me filter for project issues
2013-01-17 13:11:53 +02:00
GitLab
9115a4f92f
Remove satellites when moving namespace
2013-01-17 12:21:52 +02:00
Riyad Preukschas
9bc829d397
Fix markdown for note events
2013-01-16 23:03:21 +01:00
Riyad Preukschas
16b5417842
Use image Urls for Emoji in GFM
...
Fixes #2617
2013-01-16 22:39:45 +01:00
Riyad Preukschas
640d51f4b6
Fix GFM in events
...
Fixes #2563
2013-01-16 18:09:49 +01:00
Dmitriy Zaporozhets
729088a7af
Owner can enable public mode for project
2013-01-16 16:54:01 +02:00
Dmitriy Zaporozhets
08426d336d
Merge pull request #2538 from jouve/app_helper
...
clean application_helper a bit
2013-01-16 04:59:29 -08:00
Dmitriy Zaporozhets
211c06e419
Fix few test and notify for commit author
2013-01-15 13:37:20 +02:00
Dmitriy Zaporozhets
f598cc7897
change logic on line_code
2013-01-15 11:12:17 +02:00
Riyad Preukschas
bda7fe38d0
Merge branch 'master' into discussions
2013-01-15 00:53:00 +01:00
Riyad Preukschas
3022786948
Merge commit 'master' into discussions
...
Conflicts:
app/assets/stylesheets/sections/notes.scss
app/contexts/notes/load_context.rb
app/models/project.rb
app/observers/note_observer.rb
app/roles/votes.rb
app/views/commit/show.html.haml
app/views/merge_requests/_show.html.haml
app/views/merge_requests/diffs.js.haml
app/views/merge_requests/show.js.haml
app/views/notes/_note.html.haml
features/steps/project/project_merge_requests.rb
spec/models/note_spec.rb
2013-01-15 00:52:25 +01:00
Riyad Preukschas
74e48f070f
Smaller fixes
2013-01-15 00:27:26 +01:00
Dmitriy Zaporozhets
a36926216f
line numbers for blame
2013-01-14 20:55:57 +02:00
Dmitriy Zaporozhets
23e338852c
Dont set @project variable in list. Remove a bit of duplication in dash and group
2013-01-14 10:09:01 +02:00
Dmitriy Zaporozhets
f716c0a1dd
profjects filter with_push to project model
2013-01-14 09:44:27 +02:00
Dmitriy Zaporozhets
8543313bf5
Few more filters for admin / projects
2013-01-14 09:37:29 +02:00
Dmitriy Zaporozhets
68bfcd0521
Add public filter to admin projects
2013-01-13 17:25:18 +02:00
Dmitriy Zaporozhets
122acb2254
fix unauth for public
2013-01-13 17:25:18 +02:00
Dmitriy Zaporozhets
4c6224aad1
Public git read-only access via http
2013-01-13 17:25:18 +02:00
Riyad Preukschas
fd836f5490
Update empty error messages and warn if not viewing the most recent wiki page
2013-01-11 21:04:21 +01:00
Riyad Preukschas
b55ed840e6
Update wiki pages
...
* Properly name columns in Pages and History views
* Link to Authors
* Make views more consistent
2013-01-11 20:20:11 +01:00
Riyad Preukschas
b3bfb75252
Fix link_to_member to not be bold by default
2013-01-11 20:16:37 +01:00
Riyad Preukschas
167f26b90d
Add an ordering scope to Wiki
2013-01-11 20:04:14 +01:00
Riyad Preukschas
5aada8cc2a
Move wiki delete button to the edit page
2013-01-11 20:03:43 +01:00
MrHammy
c913f40ca4
Update app/views/wikis/pages.html.haml
...
Changed the link in the pages of the wiki to the direct link instead of the first created page
2013-01-11 13:40:29 +01:00
Martin Bastien
f97ae2ff85
Fix for archive download (method path missing)
2013-01-10 15:55:34 -05:00
Dmitriy Zaporozhets
9152ab7955
Fix missing image for last push
2013-01-10 20:20:56 +02:00
Dmitriy Zaporozhets
e25656d09b
Improve wiki typography
2013-01-10 18:09:12 +02:00
Dmitriy Zaporozhets
dd20da1bff
Fix pager loading on every page in application
2013-01-10 17:38:37 +02:00
Dmitriy Zaporozhets
abc2bdc3aa
Remove unused images. More use of font-awesome icons
2013-01-10 08:43:25 +02:00
Dmitriy Zaporozhets
c2982c9a31
sidekiq.log in admin area. Improved admin dashboard
2013-01-10 08:43:25 +02:00
Cyril
8a3bbbdb88
clean app helper
...
* remove unused method
* simplify gravatar_icon
2013-01-10 01:46:23 +01:00
Alex Denisov
d7bc121474
replace javascript:void with preventDefault
2013-01-09 21:02:41 +00:00
Alex Denisov
5133fe8efb
dashboard js -> coffee
2013-01-09 19:30:20 +00:00
Alex Denisov
3cc0458312
Reloading of events via ajax instead of page reloading.
2013-01-09 19:30:20 +00:00
AlexDenisov
0d9f73fa1e
JavaScript removed from dashboard#index template.
2013-01-09 19:30:20 +00:00
Alex Denisov
97d17cf835
Event filters stores at cookies.
2013-01-09 19:30:20 +00:00
Alex Denisov
b255c3c44b
Tests on events filtering added
2013-01-09 19:30:20 +00:00
Dmitriy Zaporozhets
71bd956866
email via sidekiq. start and stop rake tasks
2013-01-09 08:44:05 +03:00
Dmitriy Zaporozhets
c7bb3a1f72
sidekiq
2013-01-09 08:14:05 +03:00
Dmitriy Zaporozhets
31e3dc600a
Fix routing specs
2013-01-09 09:47:25 +02:00
Dmitriy Zaporozhets
80e79f33af
Merge pull request #2516 from jouve/fix_json_exemples_in_help
...
fix exemple js data in help/web_hook
2013-01-08 23:43:43 -08:00
Dmitriy Zaporozhets
aa97ff7fde
Fixed tree logs for branches with slash. Fixed remember of path when switch branch
2013-01-09 09:34:26 +02:00
Cyril
0a0d2ecf85
fix exemple js data in help/web_hook
2013-01-08 15:34:15 +01:00
Dmitriy Zaporozhets
b6568db1bc
Fix minor style issue for compare
2013-01-08 12:23:33 +02:00
Dmitriy Zaporozhets
f9528bfb86
a bit of restyling for issues and merge request lists
2013-01-08 08:14:05 +03:00
Dmitriy Zaporozhets
cc64f2a814
Common filtering for dashboard and group. Share partial search result partial
2013-01-07 20:52:43 +02:00
Dmitriy Zaporozhets
fb470e8e2a
Validate username uniq in scope of namespace
2013-01-07 17:36:24 +02:00
Dmitriy Zaporozhets
8d8c161a7f
Speedup dashboard via loading events with ajax
2013-01-07 14:36:01 +02:00
Dmitriy Zaporozhets
6c777ff823
Improve milestone show page
2013-01-07 14:08:03 +02:00
Dmitriy Zaporozhets
676a9a7e28
Fix xss vulnerability
2013-01-07 11:32:12 +02:00
Dmitriy Zaporozhets
1665a06fdd
Added cleanup to help rake
2013-01-06 00:30:38 +02:00
Dmitriy Zaporozhets
68eb394824
Green button when we create new item, blue when save or some primary action
2013-01-06 00:08:02 +02:00
Dmitriy Zaporozhets
baf591cc27
Fix network test and snippets expired
2013-01-05 23:49:01 +02:00
Dmitriy Zaporozhets
891bc414b1
Fix merge_request js -> ci_path
2013-01-05 23:26:14 +02:00
Dmitriy Zaporozhets
eded4bfa95
Raise exception and show message to user if repo missing satellite
2013-01-05 23:09:26 +02:00
Dmitriy Zaporozhets
eaa8cd28d0
Merge branch 'mergerequest-to-coffee' of https://github.com/koenpunt/gitlabhq into koenpunt-mergerequest-to-coffee
2013-01-05 22:54:48 +02:00
Dmitriy Zaporozhets
f33ada855c
Merge pull request #2226 from jouve/username
...
add username to team_member page
2013-01-05 12:33:39 -08:00
Dmitriy Zaporozhets
9f1a4acf62
Merge pull request #2207 from koenpunt/system-to-fileutils
...
replaced system() calls with FileUtils.* methods
2013-01-05 10:03:13 -08:00
Dmitriy Zaporozhets
1724f45f46
Remove unused styles. Restyled Issues a bit
2013-01-05 14:49:08 +02:00
Dmitriy Zaporozhets
de05a598b3
Update to rails 3.2.10. Use simplercov in spinach too
2013-01-05 13:30:42 +02:00
Dmitriy Zaporozhets
5a214ee6f1
Remove unused methods
2013-01-05 13:11:15 +02:00
Dmitriy Zaporozhets
e3d7ce2cc4
Tests are fixed now
2013-01-05 12:12:02 +02:00
Koen Punt
a1566a9c86
Converted merge_requests.js to coffeescript and updated code
2013-01-05 02:53:34 +01:00
Dmitriy Zaporozhets
e16cebac3e
Fixed styles, ProjectHook specs etc
2013-01-05 00:35:38 +02:00
Dmitriy Zaporozhets
c6298678f5
use ui-box as for all
2013-01-04 23:35:31 +02:00
Dmitriy Zaporozhets
14d0ef8f37
Show images preview in notes. Show line additions/deletions for commit
2013-01-04 22:13:32 +02:00
Dmitriy Zaporozhets
ef5b36eaaf
Fixed protected branches and file edit
2013-01-04 21:45:30 +02:00
Dmitriy Zaporozhets
afbdbb0c95
Rspec fixes
2013-01-04 18:50:31 +02:00
Dmitriy Zaporozhets
dccd8b6eaa
Continue refactoring. Use repostory and team
2013-01-04 08:43:25 +02:00
Dmitriy Zaporozhets
39ba934c0a
REpostiry, Team models
2013-01-03 21:09:18 +02:00
Dmitriy Zaporozhets
e6c0673ef1
Rspec models Milestone, Commit, UsersProject
2013-01-03 19:11:14 +02:00
Koen Punt
6b9177ca02
replaced system() calls with FileUtils.* method
...
This also makes that 'mv: cannot stat `/ho..' is not shown in the test :)
consistent spacing
require fileutils
Revert "require fileutils"
This reverts commit 54313d3bbaa60cfc5b405be50cc00b7f6b0cb715.
new hash notation
FileUtils.mv in begin/rescue block
2013-01-03 15:36:50 +01:00
Dmitriy Zaporozhets
d6036f08aa
move activated? method to service
2013-01-03 09:52:14 +02:00
Dmitriy Zaporozhets
da03a5c7e2
more refactoring using models/concerns
2013-01-03 09:06:07 +02:00
Dmitriy Zaporozhets
40a956eb68
Few more fixes after removing roles
2013-01-03 00:01:08 +02:00
Dmitriy Zaporozhets
cac7723451
Get rid of roles
2013-01-02 23:35:11 +02:00
Riyad Preukschas
e29687552e
Fix link titles
2013-01-02 21:07:02 +01:00
Dmitriy Zaporozhets
07a5cb2ef8
More readable Title for tab
2013-01-02 21:52:03 +02:00
Riyad Preukschas
621c6b8533
Fix commit note notification
2013-01-02 20:50:24 +01:00
Riyad Preukschas
7335f366dc
Fix comment and reply buttons
2013-01-02 20:49:27 +01:00
Dmitriy Zaporozhets
642e64034c
Fix crash on group => show
2013-01-02 20:59:47 +02:00
Dmitriy Zaporozhets
ce484fa9da
Fixed admin -> group -> show
2013-01-02 20:45:11 +02:00
Dmitriy Zaporozhets
ccf0686b01
Fix api specs. Use id instead path
2013-01-02 19:46:06 +02:00
Dmitriy Zaporozhets
d431e43392
Fix few bugs and tests after refactoring ownership logic
2013-01-02 19:32:34 +02:00
Dmitriy Zaporozhets
00a1f5bc2c
Project has now correct owner and creator. Increased test coverage
2013-01-02 19:00:00 +02:00
Dmitriy Zaporozhets
91995909d9
Fix #2375 . Admin and owner can manage groups
2013-01-02 18:57:02 +02:00
Dmitriy Zaporozhets
ffe064a2c1
Bit of cleanup and improving mailer
2012-12-31 19:46:40 +02:00
Dmitriy Zaporozhets
cf3f22cc99
Corrent link for MR diff note in email
2012-12-31 19:06:49 +02:00
Dmitriy Zaporozhets
22ec3fa14c
Fix MR css for accept MR block
2012-12-31 18:35:38 +02:00
Dmitriy Zaporozhets
e5ff5c2869
Use project with namespace in email subject
2012-12-31 18:22:44 +02:00
Dmitriy Zaporozhets
9df17fa4c5
Merge pull request #2438 from cvut/query-perf
...
Optimize query for keys of repository members
2012-12-31 00:15:19 -08:00
Dmitriy Zaporozhets
0a2ac8371d
Add missing subject for wall comment
2012-12-30 20:26:09 +02:00
Jakub Jirutka
a54b2e80f8
Optimize query for keys of repository members
...
…to load them at once and then use query cache.
2012-12-30 18:54:02 +01:00
Dmitriy Zaporozhets
82ae973a99
Describe for Roles
2012-12-30 16:19:31 +02:00
Dmitriy Zaporozhets
d075df56d3
Improve perfomance of removeing group
2012-12-30 14:26:19 +02:00
Dmitriy Zaporozhets
f45345edb3
Fix project destroy timeout from admin area. Added 30 ssh keys to dev seeds
2012-12-30 14:09:43 +02:00
Dmitriy Zaporozhets
a16533a04a
Add groups to search autocomplete. Use alphabetically scope for users order
2012-12-30 13:50:23 +02:00
Dmitriy Zaporozhets
e37a043df7
Get rid of skipping callbacks in production code. Dont trigger gitolite more than once on import in group
2012-12-30 13:37:33 +02:00
Saito
151ada7645
Merge pull request #2162 from frohoff/config-improvements
...
support for running in non-root directory/path (RAILS_RELATIVE_URL_ROOT)
2012-12-29 12:19:07 -08:00
Robert Hopson
32be082055
Update app/views/notify/new_merge_request_email.html.haml
...
Fix spelling of 'assignee'
2012-12-28 10:56:48 -08:00
Chris Frohoff
21e55ca318
added RAILS_RELATIVE_URL_ROOT support
2012-12-28 18:11:28 +00:00
Dmitriy Zaporozhets
e9394c48ca
Fix dir_exists?
2012-12-28 06:24:05 +03:00
Dmitriy Zaporozhets
d03964d6ec
Fixed and improved enable_naamespace migration task
2012-12-28 06:14:05 +03:00
Dmitriy Zaporozhets
1f3bdd453e
Allow spaces in project name
2012-12-28 09:29:57 +02:00
Dmitriy Zaporozhets
3de4271846
Merge branch 'feature/add_user_to_projects_in_group-2298' of https://github.com/zzet/gitlabhq into zzet-feature/add_user_to_projects_in_group-2298
2012-12-28 09:14:28 +02:00
Dmitriy Zaporozhets
4cbb29cfad
Fix not_in_project scope. Added counters in admin -> users. Improved seeds
2012-12-27 06:14:05 +03:00
Andrey Kumanyaev
c8bf5905bf
Fix form url and routes path
2012-12-26 20:31:18 +04:00
Andrey Kumanyaev
98044f0f14
Code duplication removed from controllers
2012-12-26 20:30:11 +04:00
Andrey Kumanyaev
39e7a0eafe
Rewrite rendering rows with users projects access in Users table in Admin group section
2012-12-26 19:52:16 +04:00
Andrey Kumanyaev
634783feb0
Rename scope "in_group" to "in_namespace"
2012-12-26 19:52:16 +04:00
Andrey Kumanyaev
1e3d238910
Replace short loop variable from "p" to "project"
2012-12-26 19:52:15 +04:00
Andrey Kumanyaev
2753cea75a
Add variable form in user section
2012-12-26 19:52:15 +04:00
Andrey Kumanyaev
25c5763780
Add functional in user section
2012-12-26 19:52:15 +04:00
Andrey Kumanyaev
9c574464a6
Add functional in admin section
2012-12-26 19:52:15 +04:00
Andrey Kumanyaev
17ea019f4e
Add Project name validation
2012-12-26 19:52:15 +04:00
Dmitriy Zaporozhets
c8ba5c2d58
Fix routing issues when navigating over tree, commits etc
2012-12-25 06:14:05 +03:00
Dmitriy Zaporozhets
6570843f84
Fix MR count for group scope
2012-12-24 21:27:12 +02:00
Dmitriy Zaporozhets
4ba24596d3
Make the logo icon more awesome
2012-12-24 21:18:23 +02:00
Dmitriy Zaporozhets
a87fccc083
Update projects in gitolite after namespace moved. Added rake task to cleanup garbage from gitolite
2012-12-24 20:02:08 +02:00
Dmitriy Zaporozhets
c49a3106ff
Merge pull request #2350 from Razer6/milestone-expiration-date
...
Changed wording if milestone already expired
2012-12-24 05:58:28 -08:00
Dmitriy Zaporozhets
efc4cae1b7
Add License
2012-12-24 14:33:16 +02:00
Dmitriy Zaporozhets
2937f35f9a
Replace Wire font with Yanone. Show only icon as link to dashboard
2012-12-24 14:24:45 +02:00
Dmitriy Zaporozhets
d80d4cd92b
Replace font with free one
2012-12-24 12:37:28 +02:00
Robert Schilling
d62a8a4d50
Changed wording if milestone already expired, using Date#past
2012-12-23 21:16:51 +00:00
Riyad Preukschas
db2c15369c
Merge branch 'master' into discussions
...
Conflicts:
app/assets/stylesheets/main.scss
app/models/project.rb
app/views/notes/_common_form.html.haml
app/views/notes/_per_line_form.html.haml
lib/gitlab/markdown.rb
spec/models/note_spec.rb
2012-12-23 01:03:57 +01:00
Dmitriy Zaporozhets
25c33ca3d0
Fix webhook data sample
2012-12-23 01:14:04 +02:00
Dmitriy Zaporozhets
3ff131a747
Improve web hook data. Use clonable url in repo info
2012-12-23 01:10:57 +02:00
Dmitriy Zaporozhets
86ed2e8f17
Fixed MR count on dashboard
2012-12-23 00:39:42 +02:00
Riyad Preukschas
5d1044c335
Fix Commit#to_diff
2012-12-22 20:36:33 +01:00
Dmitriy Zaporozhets
1ba28aaef8
Implement UsersProject project_access validation
2012-12-22 19:52:28 +02:00
Dmitriy Zaporozhets
cec866a7ce
Improve wiki rendering. Fix pygemnt + markdown invalid html
2012-12-22 13:01:15 +02:00
Dmitriy Zaporozhets
a7b572d0ab
Fixed #2333
2012-12-22 11:59:05 +02:00
Dmitriy Zaporozhets
8fe58ed541
Merge pull request #2330 from gitlabhq/v4.0-api-fixes
...
V4.0 API fixes
2012-12-22 00:43:17 -08:00
Dmitriy Zaporozhets
86673a66b7
Fix fark background highlight
2012-12-21 23:22:52 +02:00
Riyad Preukschas
eaa99478a7
Up API version to v3
2012-12-21 18:55:39 +01:00
Dmitriy Zaporozhets
a47032bc29
Merge branch 'gh-issue-1509' of https://github.com/koenpunt/gitlabhq into koenpunt-gh-issue-1509
...
Conflicts:
vendor/assets/javascripts/branch-graph.js
2012-12-21 13:07:34 +02:00
Dmitriy Zaporozhets
a567d596f8
Merge pull request #2305 from gitlabhq/fix_gfm_auto_complete
...
Fix and refactoring gfm_autocomplete
2012-12-21 02:47:55 -08:00
Riyad Preukschas
0efc903eef
Fix text in project move mail
2012-12-20 22:25:42 +01:00
Dmitriy Zaporozhets
2a3f5dae0f
Fix email send on close/reopen issue. Display project name with namespace. remove css style
2012-12-20 23:04:27 +02:00
Dmitriy Zaporozhets
75dd704294
Send update instructions after project namespace id changed or namespace path changed
2012-12-20 22:16:51 +02:00
Dmitriy Zaporozhets
d188adfd97
Changelog updated. Added warnings to username form
2012-12-20 21:16:42 +02:00
Valeriy Sizov
77d632890b
refactoring gfm_autocomplete
2012-12-20 20:52:12 +02:00
Riyad Preukschas
757c7a5291
Fix gravatar and ldap config
2012-12-20 16:54:28 +01:00
Riyad Preukschas
19eb637419
Update uses of Gitolite.config.foo settings
2012-12-20 16:54:28 +01:00
Dmitriy Zaporozhets
9bc315bb25
Merge pull request #2211 from jojosch/fix-dark-code-preview
...
fix dark code preview background when displaying long lines
2012-12-20 07:46:59 -08:00
Dmitriy Zaporozhets
b772c2c3f0
Fix issue update.js
2012-12-20 16:42:13 +02:00
Dmitriy Zaporozhets
a7aee9d1ee
Pretty compare mode
2012-12-19 20:14:05 +03:00
Dmitriy Zaporozhets
40c6d87175
Merge pull request #2315 from koenpunt/gh-issue-513
...
Added compare switch
2012-12-20 06:15:39 -08:00
Koen Punt
b2e31692a5
Added icon
2012-12-20 14:58:07 +01:00
Koen Punt
d11f9a632c
only show switch if from and to are set
2012-12-20 14:42:05 +01:00
Koen Punt
9916e8d6dc
Updated test to match with switched commits
...
Added compare switch
2012-12-20 14:39:39 +01:00
Koen Punt
6d93eafa6a
disabled sorting of commits before compare
2012-12-20 13:50:43 +01:00
Koen Punt
a09d938215
Flipping commit ids in commits_between, fixes #513
2012-12-20 13:31:09 +01:00
Dmitriy Zaporozhets
4b02f4a22d
show production.log, show only active milestone for issue filter
2012-12-19 07:14:05 +03:00
Dmitriy Zaporozhets
e9c6d4adfa
Merge branch 'refactor_issues' of dev.gitlabhq.com:gitlab/gitlabhq
2012-12-20 13:50:42 +00:00
Dmitriy Zaporozhets
adb17d6052
Cleanup after issues refactor and fix test
2012-12-20 15:39:54 +02:00
Dmitriy Zaporozhets
2f7effe804
Refactor issues, Remove ajax
2012-12-19 06:14:05 +03:00
Dmitriy Zaporozhets
8826077471
Refactor css lists. Use well-list class
2012-12-18 06:14:05 +03:00
Dmitriy Zaporozhets
85d5f606f6
Labels autocomplete
2012-12-18 06:14:05 +03:00
Dmitriy Zaporozhets
2b921a6c72
Few icons for services list
2012-12-20 11:52:42 +02:00
Dmitriy Zaporozhets
9b57bf7811
Remove main. Use application.scss instead
2012-12-19 20:57:41 +02:00
Dmitriy Zaporozhets
965102b3f6
Move mixins and variables under gitlab bootstrap
2012-12-19 19:02:12 +02:00
Dmitriy Zaporozhets
52fbcd45a4
Better organization of styles
2012-12-19 18:34:24 +02:00
Dmitriy Zaporozhets
9ada678819
Split commit_id and noteable_id for Note
2012-12-18 20:02:00 +02:00
Dmitriy Zaporozhets
f4a6f1fd5a
Fix admin paging gap issue
2012-12-17 15:57:10 +02:00
Dmitriy Zaporozhets
5058c4fdcf
Fix wall notes event trying to render target
2012-12-16 19:52:39 +02:00
Dmitriy Zaporozhets
26afde94fd
Merge pull request #2250 from jouve/fix_missing_tr_in_thead
...
add missing mandatory tr in thead
2012-12-16 08:16:42 -08:00
Dmitriy Zaporozhets
45e208cb19
Merge pull request #2287 from Partugal/patch-add-more-restricts-to-project-name
...
added more denied project names
2012-12-16 08:15:57 -08:00
Johannes Schleifenbaum
d3b3810928
fix dark code preview background when displaying long lines
2012-12-15 11:44:30 +01:00
Sergey Linnik
f7e934696c
added more denied project names
2012-12-15 14:33:45 +04:00
Dmitriy Zaporozhets
0f7d3f591c
Moving repositories spec to roles. Added missing spec for project
2012-12-15 12:32:09 +02:00
Riyad Preukschas
d2be7577c1
Merge pull request #2243 from jouve/fix_gfm_username_autocomplete
...
fix gfm autocomplete for usernames
2012-12-14 13:56:06 -08:00
Dmitriy Zaporozhets
b79e00881e
Uncommented test observing comment event
2012-12-14 22:05:10 +02:00
Dmitriy Zaporozhets
0ff468160e
Fixed event.allowed? with event.proper?
2012-12-14 21:54:49 +02:00
Dmitriy Zaporozhets
f03dc8716d
Fix author_id_of_changes mass assignment
2012-12-14 21:48:16 +02:00
Dmitriy Zaporozhets
f2db188dbe
Processing with note events. reformated dashboard for more events to handle
2012-12-14 21:39:55 +02:00
Dmitriy Zaporozhets
678e5355a3
Create events on comments and milestone
2012-12-14 19:33:33 +02:00
Dmitriy Zaporozhets
190e483fb4
Rework of milestones
2012-12-14 08:34:05 +03:00
Dmitriy Zaporozhets
b01f8b63c2
added NamespacedProject role. Extended project info displayed for admin. Fixed project limit
2012-12-14 08:14:05 +03:00
Dmitriy Zaporozhets
44209861e8
Allow group path renaming. Dont show project transfer if no permissions. More danger messages :)
2012-12-14 06:14:05 +03:00
Dmitriy Zaporozhets
a8fbda945e
bit reordering and cleanup unused styles
2012-12-13 21:44:55 +02:00
Dmitriy Zaporozhets
1d156c9c8e
Fix project lookup. Show error if project transfer fails
2012-12-13 19:20:37 +02:00
Dmitriy Zaporozhets
03369a9165
Use one helper for linking to team member. More clear title for Issue and MR
2012-12-13 06:14:05 +03:00
Cyril
a5861b8ff3
fix gfm autocomplete for usernames
2012-12-13 01:44:25 +01:00
Valeriy Sizov
b48852e789
Merge pull request #2261 from jouve/fix_user_validation
...
Validates presence of User#name
2012-12-12 09:47:56 -08:00
Dmitriy Zaporozhets
bca7bddd3d
Add ace editor to snippets
2012-12-12 19:42:08 +02:00
Cyril
63d9373aa8
Validates presence of User#name
...
The 2 reasons are :
- creation of user fail if name is empty : in after_save, it tries to create a
namespace with namespace.name = user.name and namespece validates presence
Namespace#name
- in the web app links to team members are broken with empty User#name because
they are of the form <a href'...'> user.name </a>
2012-12-12 17:53:43 +01:00
Dmitriy Zaporozhets
273c0d2aa3
Merge pull request #2253 from alexleutgoeb/patch-1
...
Minor: Change html input type to "email" on sign-in view
2012-12-12 04:17:14 -08:00
Dmitriy Zaporozhets
439d03bbed
Fix namespace api autocomplete
2012-12-12 12:54:28 +02:00
Dmitriy Zaporozhets
105f5ba3c9
Reduce header font a bit. Moved to mixin header font styles
2012-12-12 12:30:19 +02:00
Dmitriy Zaporozhets
d7eb314553
Project titles with namespaces
2012-12-12 12:02:29 +02:00
Dmitriy Zaporozhets
743073ce5f
pretty gl icon for dark themes. Removed old gl icons
2012-12-11 21:11:29 +02:00
Dmitriy Zaporozhets
7f636b1306
Fix project namespaces for web hooks data
2012-12-11 19:16:56 +02:00
Alex Leutgöb
f2bf05066d
Add autofocus attribute to sign-in email field
2012-12-11 11:57:25 +01:00
Alex Leutgöb
8738eb2369
Change html input type to "email" on sign-in view
...
As long as the username is the user's email address it makes sense to use input="email" helper for the email field. This allows HTML5 capable (mobile) devices to bring up an email input keyboard instead of the default one.
2012-12-11 11:25:55 +01:00
Dmitriy Zaporozhets
5d219bd5f0
Fix gitolite error instructions
2012-12-11 09:22:14 +02:00
Dmitriy Zaporozhets
ca936d2784
Improve CI integration for merge requests
2012-12-11 06:14:05 +03:00
Cyril
c76764b7dc
add missing mandatory tr in thead
2012-12-11 02:39:05 +01:00
Cyril
7d3ee2baa6
add username to team_member page
2012-12-11 02:17:09 +01:00
Riyad Preukschas
a5243178ed
Fix commit url in PushObserver#post_receive_data
...
Fixes #2246
2012-12-10 20:28:18 +01:00
Dmitriy Zaporozhets
b1437d4c8d
use link_to_project for Dashboard: Issues, MR
2012-12-10 15:39:10 +02:00
Riyad Preukschas
20c8d6e644
Merge pull request #2222 from jojosch/add-test-help-raketasks
...
add help/raketasks to routing spec and search autocomplete
2012-12-10 05:38:14 -08:00
Dmitriy Zaporozhets
bf13579b92
Make admin sorting more obvious
2012-12-10 06:14:05 +03:00
Dmitriy Zaporozhets
f1dfc27c5d
Replace project with namespace for events
2012-12-09 16:03:24 +02:00
Dmitriy Zaporozhets
f4d9059b7e
Show project with namespace in feeds
2012-12-09 10:56:15 +02:00
Dmitriy Zaporozhets
8a08fdcd32
Fix worker specs to parse namespaces
2012-12-09 10:34:46 +02:00
Dmitriy Zaporozhets
80e984ee5e
Fix project lookup in post receive
2012-12-08 20:48:33 +02:00
Johannes Schleifenbaum
3a48177762
add help raketasks to search autocomplete
2012-12-08 17:35:10 +01:00
Koen Punt
4b2ecbc420
Updated branch-graph, abstracted some code in seperate functions
...
Removed unused Raphael.fn.popup
2012-12-07 22:05:17 +01:00
Johannes Schleifenbaum
eededdd4be
fix notify_team on wall
2012-12-07 19:36:12 +01:00
Koen Punt
e1282d507f
BranchGraph now loads async
...
Centralized keyboard and drag events for BranchGraph
2012-12-07 19:06:46 +01:00
Koen Punt
40576b8709
Fixed #1509 by converting the entities in js
...
Converted BranchGraph to some sort of Class
2012-12-07 17:39:40 +01:00
Dmitriy Zaporozhets
84465576d7
Dont show remove project button if you have no permission
2012-12-07 15:53:04 +02:00
Ariejan de Vroom
3d9ba7b76c
Merge pull request #2202 from gitlabhq/ui/tiny_nav
...
Redesign for navigation bar.
2012-12-07 01:35:48 -08:00
Sergey Linnik
0aa7f79ca4
allow customize gravatar url
2012-12-07 00:44:22 +04:00
Sergey Linnik
2c37fa381e
fix some glitches in gravatar image url generation
...
always use proper size value
do not show alt text when avatar image not loaded
2012-12-07 00:03:13 +04:00
Dmitriy Zaporozhets
55f776f095
Tiny nav
2012-12-06 16:54:53 +02:00
Riyad Preukschas
9b96509899
Fix broken styling after #2176
...
Closes #2196
2012-12-06 11:08:51 +01:00
Dmitriy Zaporozhets
4c3cdfa4ff
Make profile dropbown a bit bigger
2012-12-05 17:08:24 +02:00
Dmitriy Zaporozhets
a350b52c9b
Rewrite project security model tests
2012-12-05 17:06:15 +02:00
Dmitriy Zaporozhets
674efd38d8
Fix 500 error on services page. Fixed active project tab when on services
2012-12-05 14:17:40 +02:00
Dmitriy Zaporozhets
cc0295b789
Only owner can remove project
2012-12-05 06:14:05 +03:00
Riyad Preukschas
b47173da6a
Revamped note form options.
2012-12-03 22:51:57 +01:00
Riyad Preukschas
4ed8278870
Fix a bunch of smaller glitches.
2012-12-03 22:51:57 +01:00
Riyad Preukschas
7978f8dd2b
Fix handling form errors.
2012-12-03 22:51:57 +01:00
Riyad Preukschas
c1ffee4e65
Fix dicussion headers
2012-12-03 22:51:57 +01:00
Riyad Preukschas
c20af32ae4
Pull together and rename Notes partials
2012-12-03 22:51:57 +01:00
Riyad Preukschas
6fc10fa256
Unify forms for discussions and main target.
...
Allows previews and uploads in all forms.
Also fixes #1730
2012-12-03 22:51:56 +01:00
Riyad Preukschas
fbd345ea20
Make attachments more obvious
2012-12-03 22:51:56 +01:00
Riyad Preukschas
c4a7824a8c
Fix wall notes
2012-12-03 22:51:56 +01:00
Riyad Preukschas
140652e9b0
Fix common form and note preview
2012-12-03 22:51:56 +01:00
Riyad Preukschas
5d3fb35cd1
Rename JS behaviors
2012-12-03 22:51:56 +01:00
Riyad Preukschas
918dc87376
Move code for appending a discussion note to notes JS
2012-12-03 22:51:56 +01:00
Riyad Preukschas
fac4e3f2e5
Reformat notes JS
2012-12-03 22:51:56 +01:00
Riyad Preukschas
d9b15fc17d
Crop and rename the add diff note image
2012-12-03 22:51:56 +01:00
Riyad Preukschas
494ae87840
Refactor discussion reply
2012-12-03 22:51:56 +01:00
Riyad Preukschas
1319373d58
Fix loading notes with empty line_code in Project#commit_notes
2012-12-03 22:51:56 +01:00
Riyad Preukschas
e8f10f317f
Fix Note validation
...
* remove length restriction on note
* add format validation for line_code
2012-12-03 22:51:56 +01:00
Riyad Preukschas
654f10102e
Remove paging from all notes except the wall
2012-12-03 22:51:56 +01:00
Riyad Preukschas
06ea122840
Refactor diff notes creation
2012-12-03 22:51:56 +01:00
Riyad Preukschas
39834ec640
Move diff notes into the actual diff content column
2012-12-03 22:51:56 +01:00
Riyad Preukschas
4d2278e7c6
Rename commits/text_file partial to text_diff
2012-12-03 22:51:56 +01:00
Riyad Preukschas
6d5c29dc2b
Inline diff_notes_reply_button partial
2012-12-03 22:51:56 +01:00
Riyad Preukschas
3bc507e5c5
Rename diff note partials
2012-12-03 22:51:56 +01:00
Riyad Preukschas
534bd5a268
Fix emoji generation and styling
2012-12-03 22:51:56 +01:00
Riyad Preukschas
bd60a4ed40
Make notes JS know which notes are new in a request
2012-12-03 22:51:56 +01:00
Riyad Preukschas
ae067ee322
Fix vote counting
2012-12-03 22:51:56 +01:00
Riyad Preukschas
6c6f415cae
Fix appending diff line notes
2012-12-03 22:51:55 +01:00
Riyad Preukschas
5c2f6d7f05
Update notes views to support discussions
2012-12-03 22:51:55 +01:00
Riyad Preukschas
7971383d53
Rename the "Comments" tab for merge requests "Discussion"
2012-12-03 22:51:55 +01:00
Riyad Preukschas
a048c955fd
Add JS behaviors
2012-12-03 22:51:55 +01:00
Riyad Preukschas
a58385247d
Add discussions for merge requests to notes controller
2012-12-03 22:51:55 +01:00
Riyad Preukschas
9b919939a3
Fix parameter passing and wording for per line notes
2012-12-03 22:51:55 +01:00
Riyad Preukschas
b91d680257
Fix notes helper
2012-12-03 22:51:55 +01:00
Riyad Preukschas
fc1c250d40
Reorder Note methods and add helpers
2012-12-03 22:51:55 +01:00
Johannes Schleifenbaum
fddc0c29aa
add help page for gitlab specific rake tasks
2012-12-03 17:19:33 +01:00
Dmitriy Zaporozhets
a5105ddf13
Fix broken CSS
2012-12-03 14:39:13 +02:00
Dmitriy Zaporozhets
6ea6ab7c8d
Restyled services page in order to make it more usable
2012-12-02 08:41:06 +03:00
Koen Punt
61140b71cd
overflow: auto so content won't break layout #1612
2012-12-05 01:22:30 +01:00
Dmitriy Zaporozhets
e376f31507
Admin can move project to ANY namespace. Updated permissions page
2012-12-04 22:48:24 +02:00
Dmitriy Zaporozhets
2a1c5cdf99
Only owner of current namespace can change project namespace
2012-12-04 22:06:55 +02:00
Dmitriy Zaporozhets
9acd7cf1bd
Show namespaces when adding projects to user in admin area
2012-12-04 15:26:12 +02:00
Dmitriy Zaporozhets
d8398921eb
Dont allow select block user as new team member
2012-12-04 15:22:22 +02:00
Dmitriy Zaporozhets
ba74fa1413
Remove some bugs. Add warnings for renaming group. Add ability to cahnge group owner.
2012-12-03 21:14:05 +03:00
Dmitriy Zaporozhets
7f6bbf06f8
Fix bug getting started message when navigate to personal projects w/o them exist
2012-12-04 11:18:41 +02:00
Dmitriy Zaporozhets
f2a76228f2
Remove unsued css styles. Fixed Milestone preselected date.
2012-12-01 09:14:05 +03:00
Dmitriy Zaporozhets
2d076394aa
Fix github issue #967
2012-12-03 13:22:28 +02:00
Dmitriy Zaporozhets
0530e5baae
Add description to project features on edit project page
2012-12-02 19:28:23 +02:00
Dmitriy Zaporozhets
46bf3a0949
Refactored profile to resource. Added missing flash notice on successfull updated. Update username via ajax
2012-12-02 13:29:24 +02:00
Dmitriy Zaporozhets
f2e1c8b709
Merge pull request #2138 from jouve/refactor_flash
...
refactor flash
2012-12-02 02:18:34 -08:00
Johannes Schleifenbaum
0323610b72
commit diff - check if prev_commit is not nil
2012-12-01 19:31:39 +01:00
Cyril
a9a5497915
refactor flash
...
* make unobtrusive js
* convert js to coffee
2012-12-01 18:40:47 +01:00
Nihad Abbasov
24e172597a
remove length limit from notes
2012-12-01 03:19:16 -08:00
Dmitriy Zaporozhets
c177593e2c
Merge pull request #2059 from dolanor/feature-rewording-blocked-users
...
Rewording for the account being blocked
2012-11-30 12:50:06 -08:00
Dmitriy Zaporozhets
c19e766f1e
Added vendor/bundle to gitignore. Removed project js slugify
2012-11-30 19:49:51 +02:00
Dmitriy Zaporozhets
eb3e07a509
Use project owner if no namespace. Restyled team page
2012-11-30 18:26:17 +02:00
Dmitriy Zaporozhets
3c13ef648b
Fix MR comments
2012-11-30 16:03:10 +02:00
Dmitriy Zaporozhets
c38b9a2f80
Filter projects on dashboard
2012-11-30 13:40:34 +02:00
Valeriy Sizov
a03f318964
Merge pull request #2119 from erroric/fix_issue2118
...
issue #2118 : fix undefined method for nil:NilClass exception
2012-11-30 01:19:29 -08:00
Nihad Abbasov
eb061b9b06
fix label name
2012-11-29 14:26:18 -08:00
Nihad Abbasov
658f260e98
add docs for notes API
2012-11-29 12:32:05 -08:00
Dmitriy Zaporozhets
aaa1c94239
Manage team from groups page. Phase 1
2012-11-29 20:14:05 +03:00
Dmitriy Zaporozhets
08fded3fac
Minor improvments to UI
2012-11-29 18:09:27 +02:00
Alexey Loktionov
c954f2d982
issue #2118 : fix undefined method for nil:NilClass exception
2012-11-29 19:39:30 +04:00
Dmitriy Zaporozhets
9df6f7bfad
authorized_projects and authorized_groups methods for user
2012-11-29 17:17:01 +02:00
Dmitriy Zaporozhets
83f2a387d6
Merge pull request #2117 from koenpunt/scss-cleanup
...
Scss cleanup
2012-11-29 06:51:27 -08:00
Dmitriy Zaporozhets
1d889a79fb
Fix group duplication on dashboard and project order in group
2012-11-29 16:43:09 +02:00
Koen Punt
1481bae559
Selective responsive bootstrap
2012-11-29 15:37:28 +01:00
Koen Punt
0f31392712
Mixins are now all with dashes instead of underscores
...
(there really should be some convention for all gitlab css)
2012-11-29 12:18:44 +01:00
Koen Punt
d7e9eda24d
renamed blue_link var to primary_color
2012-11-29 12:18:44 +01:00
Koen Punt
df0bd0c212
Removed bg-gradient, now directly using linear-gradient
2012-11-29 12:18:44 +01:00
Koen Punt
81175073a0
removed overqualified mixins round-borders-*
2012-11-29 12:18:44 +01:00
Koen Punt
238c214ac9
Forgot to rename var
2012-11-29 12:18:44 +01:00
Koen Punt
b825582eb1
replaced redundant -*-border-radius box-shadows and others with corresponding mixins
2012-11-29 12:18:44 +01:00
Koen Punt
84de1b71d1
Added some uniformity, all css properties and values are separated by a colon and a space :
2012-11-29 12:18:44 +01:00
Koen Punt
755e4a4700
Removed css declarations out of main.scss, so main is only a collector
...
Fonts, variables and mixins are now all in their own stylesheets
2012-11-29 12:18:44 +01:00
Dmitriy Zaporozhets
eb1004f789
Refactor abilities. Added ProjectUpdate context. Fixed few bugs with namespaces
2012-11-29 12:39:03 +02:00
Saito
a1ffc673b9
Merge pull request #2096 from panxiaoming/master
...
can't open a chinese file name doc
2012-11-29 02:02:22 -08:00
Dmitriy Zaporozhets
cf8b3692cd
Merge pull request #2105 from jouve/improve_admin_views
...
Improve admin section
2012-11-29 00:39:50 -08:00
Dmitriy Zaporozhets
ff9a2e2a93
Improve admin logs
2012-11-29 07:49:11 +03:00
Dmitriy Zaporozhets
a0aa0212a9
Removed feature: comments on wiki
2012-11-29 06:14:05 +03:00
Alex Denisov
34c2d8e82e
authorized_for scope added to project
2012-11-28 20:09:13 +02:00
Dmitriy Zaporozhets
c873cf81f6
Restyled error messages in common way. Added title to head partial
2012-11-28 19:40:54 +02:00
Cyril
e0a9ffcdaa
Improve admin views for project and groups
...
* layout: add 'Groups' item to main_menu
* admin/dashboard: add a ui-box for groups
* projects and groups: remove nav tabs
2012-11-28 18:04:28 +01:00
Robert Speicher
4db362f519
Add a link to each project on the Issues dashboard
2012-11-28 11:00:02 -05:00
panxiaoming
e2b73513f4
fixed the bug of URIDECODE error
...
if link to a chinese file name, it will jump to error page;
for example, the chinese file name called "消息文档.md", when after urlencode, it will be "%E6%B6%88%E6%81%AF%E6%96%87%E6%A1%A3.md", but after use History.pushState, will jump to a bad decode link.
2012-11-28 10:09:55 +08:00
Riyad Preukschas
dc99b19af7
Fix CSS for code highlighting
2012-11-27 22:51:10 +01:00
Riyad Preukschas
184a9ecaf6
Add user_color_scheme_class helper
2012-11-27 22:51:05 +01:00
Dmitriy Zaporozhets
4340112398
Remove unused responsive formats
2012-11-27 21:30:39 +02:00
Dmitriy Zaporozhets
cfeddb554e
Fix user creation cause of dual namespace build
2012-11-27 18:27:13 +00:00
Dmitriy Zaporozhets
81f8114f24
NamespacesHelper
2012-11-27 17:48:25 +02:00
Dmitriy Zaporozhets
039996bd0a
Fix invalid method call for gitolite
2012-11-27 16:35:00 +02:00
Dmitriy Zaporozhets
f5551efdfd
Rewrite and improve git backend logic. Fix project movind. Raise exception to prevent unexpected issues
2012-11-27 09:31:15 +03:00
Tanguy Herrmann
70ef433e09
Rewording for the account being blocked
...
When signing in with SSO, if the default behaviour of gitlab is to block SSO user, the only message the people will get is 'Your account was blocked'
They should get the idea this might be only temporary and not because of a technical problem
2012-11-24 18:21:57 +01:00
Dmitriy Zaporozhets
9e8aadb0f0
Merge pull request #2026 from koenpunt/extended-image-diff
...
Added bg for transparent images
2012-11-21 12:56:06 -08:00
Dmitriy Zaporozhets
7392d28dca
Merge pull request #2030 from tsigo/theme_feedback
...
Improve user feedback on the Profile > Design page
2012-11-21 12:54:22 -08:00
Robert Speicher
30a66c065a
Improve user feedback on the Profile > Design page
...
- Header changes immediately without a page reload
- Lets the user know that we actually saved their setting when changed
2012-11-21 15:01:40 -05:00
Riyad Preukschas
d7ce2c5c07
Fix rendering template for invalid notes
2012-11-21 20:26:37 +01:00
Riyad Preukschas
3e800c3bb1
Refactor GFM JS naming and access
2012-11-21 20:25:49 +01:00
Riyad Preukschas
1cda62465f
Fix GFM JS code style
2012-11-21 20:05:37 +01:00
Koen Punt
1de0ea28b9
added bg for transparent images
...
added width and height below images in diff
2012-11-21 18:27:21 +01:00
Dmitriy Zaporozhets
4c6c24856c
Themes refactored
2012-11-21 18:19:03 +02:00
Dmitriy Zaporozhets
9477448ac0
Merge pull request #2023 from martinsp/master
...
fixes :notice after project is created in projects_controller
2012-11-21 06:25:16 -08:00
Martins Polakovs
8c5b79a923
Fixes :notice after project is created
...
When projects were created in projects_controller
create.js.haml passed notice as url parameter and
therefore notice was not displayed in the page after
redirect to the project page
2012-11-21 14:30:35 +02:00
Dmitriy Zaporozhets
898d09a21e
Gitlab_meta to 3.1. Added workaround for 500 Redis error until it will be fixed
2012-11-21 12:45:15 +02:00
Dmitriy Zaporozhets
70bf7f6e19
Project -> update repo only on create and destroy. Fixtures Updated with namespaces. Fixed moving repo
2012-11-21 08:54:05 +03:00
Dmitriy Zaporozhets
cc52eed981
Show namespace in search autocomplete
2012-11-27 07:29:11 +03:00
Dmitriy Zaporozhets
285743eee1
Merge pull request #2070 from jouve/fix_destroy_project
...
fix destroy project from admin
2012-11-27 01:53:24 -08:00
Dmitriy Zaporozhets
d7c5885c3d
Improved Issues and MR filters
2012-11-27 07:29:11 +03:00
Cyril
b382ce4d91
fix destroy project from admin
2012-11-26 01:22:44 +01:00
Dmitriy Zaporozhets
1d857aae17
project admin area - show project name with namespace
2012-11-25 18:52:12 +02:00
Dmitriy Zaporozhets
97a92f8ae7
Fixed user.namespace_id exception if namespace is nil
2012-11-25 12:26:34 +02:00
Dmitriy Zaporozhets
c31d48dd25
Allow project creation in scope of group for non-admin but group owners
2012-11-25 11:57:01 +02:00
Dmitriy Zaporozhets
2f22874ba6
Fix group assoc. Show namespace in project list
2012-11-24 22:39:51 +02:00
Dmitriy Zaporozhets
65c470e843
Reannotated
2012-11-24 22:16:51 +02:00
Dmitriy Zaporozhets
3f1d6d6ab3
move namespace dir after path changed
2012-11-24 22:11:46 +02:00
Dmitriy Zaporozhets
f37fa968b2
add ability to change namespace from project edit page
2012-11-24 22:00:30 +02:00
Dmitriy Zaporozhets
f997947664
Project can be transfered to namespace and out now
2012-11-24 12:37:30 +02:00
Dmitriy Zaporozhets
d405c8fc60
Create namespace on username init. Raise exception if project cannot be moved
2012-11-24 12:25:04 +02:00
Dmitriy Zaporozhets
4023d9f852
class for moving project
2012-11-24 11:46:19 +02:00
Dmitriy Zaporozhets
0e1635a68a
Fixing requests after namespaces. Fixed admin bug with access to project
2012-11-23 22:25:28 +02:00
Dmitriy Zaporozhets
9304d049de
Fixed some tests and snippet colorize
2012-11-23 22:31:09 +03:00
Dmitriy Zaporozhets
470aa7675e
Fix project.code-related functionality
2012-11-23 21:31:09 +03:00
Dmitriy Zaporozhets
c50ec72b52
Deprecate code for Project. Use title and path
2012-11-23 21:11:09 +03:00
Dmitriy Zaporozhets
ab9d023651
Create dir with namespace. Create namespace with user
2012-11-23 09:11:09 +03:00
Dmitriy Zaporozhets
f17ddeb394
Make admin project list more useful
2012-11-23 07:24:09 +03:00
Dmitriy Zaporozhets
552b3105fb
Fixed admin area. Create project only from one place
2012-11-23 07:31:09 +03:00
Dmitriy Zaporozhets
2b683b0d0b
Ability to create project with namespace
2012-11-23 07:11:09 +03:00
Dmitriy Zaporozhets
96105e214f
Update namespace if user changed username. Dont move project if new record
2012-11-23 06:39:09 +03:00
Dmitriy Zaporozhets
26622f4c8f
Improve routing. Project access via namespace
2012-11-22 23:34:06 +03:00
Dmitriy Zaporozhets
71214bee75
Move directory with project. Fixed all related path methods to use namespace
2012-11-22 22:41:26 +03:00
Dmitriy Zaporozhets
e29ccece33
Namespace model added. Migration to convert exit project/groups
2012-11-22 21:34:26 +03:00
Dmitriy Zaporozhets
ab42370af0
Fix sattellites
2012-11-21 09:14:05 +03:00
Dmitriy Zaporozhets
23734a715e
Dashboard filters for events
2012-11-21 08:24:05 +03:00
Dmitriy Zaporozhets
899afd0067
Fix snippet render issue cause of haml preserve
2012-11-26 07:14:05 +03:00
Dmitriy Zaporozhets
29636d4dab
Fix snippet render error
2012-11-26 06:14:05 +03:00
Dmitriy Zaporozhets
e750efd9fc
Merge pull request #2067 from riyad/diff-and-patch-for-commits-and-merge-requests
...
Diff and patch for commits and merge requests
2012-11-26 04:40:49 -08:00
Dmitriy Zaporozhets
2d5a6fc850
Fix dir permission on creation
2012-11-26 13:07:16 +02:00
Dmitriy Zaporozhets
7ae851f642
Fix critical issue with dir permission for namespaces
2012-11-26 12:43:32 +02:00
Dmitriy Zaporozhets
585eb70588
Fix http push with namespaces. Allow use of username as login
2012-11-26 11:23:08 +02:00
Riyad Preukschas
79a4ed15ce
Change "Get Patch" buttons to dropdowns orffering patches and diffs
2012-11-25 00:36:19 +01:00
Riyad Preukschas
b3834bc9b0
Remove MergeRequest#to_raw and replace it with #to_diff and #to_patch
2012-11-25 00:05:47 +01:00
Riyad Preukschas
2b1afa0e62
Remove merge_request#raw and replace it with formats to #show
...
Needed to add a constraint on the id. Otherwise the format was parsed as part of the id.
2012-11-25 00:05:44 +01:00
Riyad Preukschas
3b7c2adf0a
Add diff format to commit#show
2012-11-22 20:49:44 +01:00
Riyad Preukschas
246faa3d7a
Add Commit#to_diff for raw diff
2012-11-22 20:49:01 +01:00
Riyad Preukschas
6ddf4567f4
Don't escape Html in patches
...
Fixes #2036
2012-11-22 12:45:39 +01:00
Dmitriy Zaporozhets
0046409970
I prefer icons on header
2012-11-21 08:14:05 +03:00
Dmitriy Zaporozhets
6bf656970d
Use fieldset. Improved profile
2012-11-21 08:14:05 +03:00
Dmitriy Zaporozhets
f614ae8ef7
Increased test coverage
2012-11-21 07:14:05 +03:00
Dmitriy Zaporozhets
47234ab367
Validate username. Gitlab::Regex added
2012-11-28 06:14:05 +03:00
Dmitriy Zaporozhets
d18e2bd59d
styled error message
2012-11-21 06:14:05 +03:00
Dmitriy Zaporozhets
c1c1a1eeee
Restored old h6 of bootstrap. Fixed buttons line-height
2012-11-21 09:14:15 +02:00
Dmitriy Zaporozhets
ec7a1c504f
Fix tabs line height
2012-11-21 00:18:36 +02:00
Dmitriy Zaporozhets
dc9916b474
Merge pull request #1998 from erroric/gitlabhq_issue1669
...
fix for issue #1669
2012-11-20 14:10:45 -08:00
Dmitriy Zaporozhets
4d846c09b1
Fixed spec
2012-11-20 23:18:44 +02:00
Dmitriy Zaporozhets
942c410119
Implemented bootstrap 2.2.1.1. Restyled header panel
2012-11-20 23:05:15 +02:00
Dmitriy Zaporozhets
236584c2f8
update bootstrap to 2.2.1.1
2012-11-20 20:01:25 +02:00
Dmitriy Zaporozhets
ebcbe0c87b
Add status badge for MR
2012-11-20 20:34:05 +03:00
Dmitriy Zaporozhets
ed92cfdebd
Fix method call for service hook
2012-11-20 16:46:22 +02:00
Dmitriy Zaporozhets
f6248c255e
User custom method for services array
2012-11-20 14:22:00 +02:00
Dmitriy Zaporozhets
93fdc4ca9d
Reannotated
2012-11-20 14:19:55 +02:00
Dmitriy Zaporozhets
9f65c274ef
Fix ci service creation logic
2012-11-20 14:16:04 +02:00
Dmitriy Zaporozhets
406a0c809b
GitLabCi Service imtegration
2012-11-19 22:34:05 +03:00
Dmitriy Zaporozhets
8500743464
Post Receive Refactored. Service hooks also triggered now
2012-11-19 21:44:05 +03:00
Dmitriy Zaporozhets
95c23b2f97
Annotated. schema updated
2012-11-19 21:24:05 +03:00
Dmitriy Zaporozhets
c3b074acab
Service model and service hook
2012-11-20 11:33:49 +02:00
Dmitriy Zaporozhets
4eef112462
Merge pull request #1906 from dosire/user_cannot_be_removed_if_project_owner
...
Cannot remove user that owns a project.
2012-11-19 04:12:31 -08:00
Dmitriy Zaporozhets
cd15e89135
Merge pull request #2008 from Partugal/patch-default-order
...
add order for projects admin page
2012-11-19 04:11:18 -08:00
Dmitriy Zaporozhets
6878f55620
Bigger file name for commits diff
2012-11-19 14:01:40 +02:00
Dmitriy Zaporozhets
86b181398c
Merge pull request #2011 from koenpunt/extended-image-diff
...
Optimized commit diff views, now showing file size and file mode changes
2012-11-19 04:01:49 -08:00
Vanja Radovanović
333f7372c5
fix: grouping by date desc doesn't sort it too
2012-11-19 11:44:28 +01:00
Sergey Linnik
bb3fc1e04e
add order to projects admin page
2012-11-18 22:36:22 +04:00
Valeriy Sizov
e226551e81
Fix hooks for merge request which were accepted by web-interface
2012-11-18 19:56:29 +02:00
Koen Punt
3ac1f9459a
Optimized commit diff views, now showing file size and file mode changes
...
Replaced commit status images (diff_file_*.png) with fontawesome icons
2012-11-18 17:41:41 +01:00
Riyad Preukschas
51f48392ab
Fix type error if there is a different location hash
2012-11-17 22:26:22 +01:00
Riyad Preukschas
98e938bdb0
Fix editor form, styles and JS
2012-11-17 15:43:13 +01:00
Riyad Preukschas
7caf4de2cf
Fix setting Ace mode
2012-11-17 15:28:32 +01:00
Riyad Preukschas
6c1b44859d
Fix Haml indenting file content
2012-11-17 01:00:26 +01:00
Alexey Loktionov
31bf0cd876
fix projects sorting; fix Postgresql issue with LIMIT and DISTINCT; fix query performance
2012-11-16 22:31:17 +04:00
Marin Jankovski
19e8473eb7
Cannot remove user that owns a project.
...
Cannot remove user that owns a project.
Make lines shorter, set alert, use path instead of url.
2012-11-16 14:47:07 +01:00
Dmitriy Zaporozhets
b339c747a9
Merge pull request #1937 from riyad/add-file-line-links
...
Add file line links
2012-11-16 03:46:43 -08:00
Riyad Preukschas
ece563296b
Fix Notes JS
...
Also fixes #1983
2012-11-14 14:36:51 +01:00
Riyad Preukschas
578cf89812
Fix specs
2012-11-14 01:20:37 +01:00
Dmitriy Zaporozhets
f0a6fbaae3
Improve Commits stats code
2012-11-13 21:26:57 +02:00
Dmitriy Zaporozhets
9d499b86f8
Fix loader hiding when create new project
2012-11-13 12:36:41 +02:00
Dmitriy Zaporozhets
3c7806c3f2
Improve lists. Remove unneccessary padding
2012-11-11 00:08:42 +02:00
Dmitriy Zaporozhets
283a9c7b7d
Fix margin-right for some avatars
2012-11-10 23:45:13 +02:00
randx
3e04673334
Added feature test for stats
2012-11-10 23:33:10 +02:00
randx
1c5b2a5153
Stats page
2012-11-10 23:08:47 +02:00
Riyad Preukschas
c42ada9bee
Allow linking to file lines
...
Supported formats: "L12" for single lines and "L12-34" for multiple lines
2012-11-10 00:03:46 +01:00
Riyad Preukschas
45dcb1b5c4
Add jQuery.ScrollTo
2012-11-09 23:35:02 +01:00
Saito
b664b784f1
linguist and web browser will take care of mimetype and encoding problem.
2012-11-10 01:06:20 +08:00
jdamick
12c0408ef5
Update app/views/notify/project_access_granted_email.html.haml
...
changing wording to sound more better.
2012-11-09 11:03:42 -05:00
Saito
f1ac2a616b
remove encode lib, clean all encoded area.
2012-11-09 01:41:07 +08:00
Dmitriy Zaporozhets
784cb886cf
Sign in screen: removed hr, added clearfix
2012-11-07 17:49:52 +02:00
Dmitriy Zaporozhets
b7445bb006
Fix github issue #1946
2012-11-07 17:15:41 +02:00
Dmitriy Zaporozhets
8114d36caf
Merge pull request #1720 from coagulant/wiki_search
...
Wiki search
2012-11-07 03:51:20 -08:00
Riyad Preukschas
10d881c9ca
Line anchors for file view
2012-11-07 13:31:26 +02:00
Riyad Preukschas
be4138af75
Log caught exceptions
2012-11-06 21:16:47 +01:00
Dmitriy Zaporozhets
96b2959fe3
Styled chosen css. Lighter box shadow for blocks
2012-11-06 19:31:01 +02:00
Dmitriy Zaporozhets
949233aa1f
Changed default icon for gravatar. Moved filter out of layout
2012-11-06 13:47:43 +02:00
Dmitriy Zaporozhets
f555578414
Added EventFilter class. Compeleted first version of dashbaord filtering
2012-11-05 20:12:26 +02:00
Dmitriy Zaporozhets
ba567c8d76
Merge pull request #1914 from tsigo/issue/1910
...
Fix double icon on header button hover
2012-11-05 03:27:48 -08:00
Valeriy Sizov
4f04d7df66
Merge pull request #1915 from tsigo/issue/1912
...
Fix rendered action for password change failure
2012-11-05 01:29:03 -08:00
Robert Speicher
89d9319a79
Fix rendered action for password change failure
...
Closes #1912
2012-11-04 16:47:37 -05:00
randx
f082c8ae2a
Decouple and refactor GraphCommit
2012-11-04 23:43:33 +02:00
Robert Speicher
97bf7ac397
Fix double icon on header button hover
2012-11-04 16:29:44 -05:00
Dmitriy Zaporozhets
f8e27b92bf
Merge pull request #1902 from tsigo/breadcrumbs
...
Fix breadcrumb links on Commits page
2012-11-02 03:46:27 -07:00
Riyad Preukschas
48de0ba867
Fix source for iframe on Resque admin page
2012-11-01 23:34:16 +01:00
Robert Speicher
e60185699b
Add 'breadcrumbs' helper for Commit breadcrumb links
...
Closes #1731
2012-11-01 17:58:13 -04:00
Robert Speicher
badb092a2d
Don't initialize Tree History unless tree-slider is present
...
This was breaking breadcrumb links on non-Tree pages
2012-11-01 17:57:12 -04:00
Robert Speicher
57e6777b3c
Remove "remote" attribute from Tree breadcrumb links
...
See https://github.com/gitlabhq/gitlabhq/pull/1665#discussion_r1804447
2012-11-01 17:56:39 -04:00
Dmitriy Zaporozhets
d9c20cf5a6
Fix 404 errors on Merge Request -> new
2012-10-31 14:29:42 +02:00
Dmitriy Zaporozhets
404040d7ae
Fix invalid template path for huge commit
2012-10-30 13:35:57 +02:00
Dmitriy Zaporozhets
8272e18e57
Project path validation: array of not allowed paths
2012-10-30 13:27:15 +02:00
randx
36dbac2fd9
More seeds
2012-10-30 10:03:21 +02:00
randx
e4cf99db46
Refactor milestones related functionality. Added seeds for Milestine and MR
2012-10-30 09:22:24 +02:00
Valeriy Sizov
53a3be03fc
Update app/views/profile/account.html.haml
...
TYPO #1870
2012-10-30 00:32:32 +02:00
Valeriy Sizov
9d56c7f657
Update app/views/shared/_no_ssh.html.haml
...
TYPO
2012-10-30 00:29:13 +02:00
randx
a8398e5124
Fix merge request count for milestone index
2012-10-29 23:50:35 +02:00
randx
e705344daa
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2012-10-29 23:46:46 +02:00
randx
f417a265d7
Finalize milestones for Merge Requests
2012-10-29 23:45:11 +02:00
Riyad Preukschas
0a9adbbe4a
Fix no SSH key warning
2012-10-29 21:51:28 +01:00
randx
d4e070cfad
Improve styles. Add merge request completness to milestone percentage
2012-10-29 22:40:00 +02:00
randx
ecdf778e80
Merge branch 'public_submission_milestones_for_mr' of https://github.com/piffio/gitlabhq into piffio-public_submission_milestones_for_mr
...
Conflicts:
app/views/merge_requests/_form.html.haml
2012-10-29 21:37:46 +02:00
Dmitriy Zaporozhets
50a6c614b5
Merge pull request #1818 from riyad/refactor-satellite-actions
...
Refactor Satellite Code
2012-10-29 04:12:26 -07:00
Sergio Visinoni
263282dec9
Show Milestone information in MR Listing
...
When a MR belongs to a Milestone, show this information in the listing
with a small box telling the Milestone title.
2012-10-28 09:31:52 +01:00
Riyad Preukschas
646bad43e9
Fix styles
2012-10-27 18:27:51 +02:00
Riyad Preukschas
3d0197246e
Use #author_link for blame, commits and tree
2012-10-27 18:27:47 +02:00
Riyad Preukschas
c78359a84b
Generalize CommitDecorator#author_link to #person_link
2012-10-27 18:15:00 +02:00
Riyad Preukschas
17cec05087
Make new/edit issue forms use containers on the page instead of adding their own
...
Fixes #1830
2012-10-27 17:54:24 +02:00
Riyad Preukschas
2f5e44a02d
Enable/disable from buttons on all input events (not just key events)
...
Fixes #1836
2012-10-27 17:00:51 +02:00
randx
3c5a3fe0ae
Merge branch 'front-end' of https://github.com/NARKOZ/gitlabhq into NARKOZ-front-end
...
Conflicts:
app/views/issues/_form.html.haml
2012-10-27 11:24:11 +03:00
randx
72f984e3d3
Prevent grit from caching graph commits
2012-10-26 21:52:26 +03:00
Dmitriy Zaporozhets
1c9351abf0
Restyle branches list. Remove unneccesary styles from tree avatar
2012-10-26 19:00:09 +03:00
Dmitriy Zaporozhets
b4708d006c
Restyled git tags page. Added truncated tags message
2012-10-26 18:37:12 +03:00
Sergio Visinoni
e51c37bdbd
Display Merge Requests <-> Milestone relations
...
Show the relation between Merge Requests and Mileston in different
places:
- Merge Request page
- Milestone list page
- Milestone details page
2012-10-26 16:12:40 +02:00
Sergio Visinoni
a7d0816933
Add Milestone information in Merge Requests
...
Step 1:
* Add milestone_id in the model for merge_requests
* Make it possible to create or update a Merge Request with an attached
Milestone detail
* Add the possibility to filter by Milestone and / or Assignee in the
Merge Requests listing page
2012-10-26 16:12:40 +02:00
Riyad Preukschas
700a784bc9
Refactor EditFileAction#update and rename it to commit!
2012-10-26 01:59:50 +02:00
Riyad Preukschas
fba8ad5607
Move Gitlab::Satellite into the Satellite module
2012-10-26 00:56:24 +02:00
Riyad Preukschas
5f16687805
Update arguments for Gitlab::Satellite::EditFileAction#initialize
2012-10-26 00:39:23 +02:00
Riyad Preukschas
55779b00ea
Rename Gitlab::FileEditor to Gitlab::Satellite::EditFileAction
2012-10-26 00:33:53 +02:00
Riyad Preukschas
8c89beb6f9
Change argument order for satellite actions to always start with the user
2012-10-26 00:26:47 +02:00
Riyad Preukschas
78235edda8
Renamed Gitlab::Merge to Gitlab::Satellite::MergeAction
2012-10-26 00:19:01 +02:00
Riyad Preukschas
0447ab375a
Extract shared/clone_panel partial
2012-10-25 23:39:02 +02:00
Riyad Preukschas
ff396e0a7e
Extract search field into a partial
2012-10-25 23:39:02 +02:00
hardchor
b5ced56ba4
Some grammatical improvements
...
Nothing too dramatic, just some improvements.
2012-10-25 22:11:06 +02:00
Dmitriy Zaporozhets
11452c903f
Fix 500 error on tree view woth submodule
2012-10-25 12:30:09 +03:00
Dmitriy Zaporozhets
6d0dcb6614
Reduce max commit diff size. Added Commit::DIFF_SAFE_SIZE
2012-10-25 12:16:14 +03:00
Scott Holden
2335d7b9cf
Fix broken Note scopes with lambdas, 4.0 compat
...
Without lambdas, Date.today will be evaluated in the class body.
For it to have a running scope of last week etc, it will need to
be evaluated each time the scope is called.
In Rails 4.0, lambdas will be required for all scopes, so not a bad
idea to go ahead and change them all now.
2012-10-24 21:54:15 -07:00
Valery Sizov
38175209c5
Merge branch 'feature/import_team_from_other_project' of dev.gitlabhq.com:gitlabhq
2012-10-24 12:56:47 +00:00
Dmitriy Zaporozhets
a7efeb3781
Fix chrome issues list
2012-10-24 15:25:28 +03:00
Dmitriy Zaporozhets
6f4576b743
Spinach feature
2012-10-24 15:23:04 +03:00
Dmitriy Zaporozhets
b7a9e41bd2
Handle perfomance issue with team import. Model specs
2012-10-24 14:52:17 +03:00
Dmitriy Zaporozhets
fd0aca1225
Feature implemented
2012-10-24 14:20:53 +03:00
Staicu Ionut
2d7062d8fc
Added autofocus for issue title
2012-10-24 14:06:10 +03:00
Dmitriy Zaporozhets
b2df61d85a
Fix 500 error on admin project if empty
2012-10-23 11:29:47 +03:00
randx
9902f1af6e
Reduce line-height for commits diff lines
2012-10-22 23:49:21 +03:00
randx
e51b2d58e7
Restyled last push widget. Increased line-height for td in tables
2012-10-22 23:37:50 +03:00
randx
83dc5f9362
Fix issue with removing group
2012-10-22 21:21:34 +03:00
Marin Jankovski
d75cc7eafd
Display https as repo clone indicator and prevent modification of web_protocol variable.
...
Rewrite build_url, use web_protocol for repo indicator.
Explicitly initialize custom port to make the logic obvious.
2012-10-21 15:48:34 +02:00
Dmitriy Zaporozhets
cd9f135a66
Merge pull request #1717 from riyad/add-author-to-tree-listing
...
Update author info in tree listing
2012-10-21 04:08:45 -07:00
randx
0189ee97ed
Security for online editor. Replace dev_access?, master_access? with can? method usage
2012-10-21 12:12:14 +03:00
Riyad Preukschas
d4e3664067
Fix bug in MergeRequest#mark_as_unmergable
2012-10-20 15:27:34 +02:00
Riyad Preukschas
122769e358
Refactor Gitlab::Merge
...
* Refactor and document methods
* Rename merge to merge!
* Fixes #1544
2012-10-20 15:25:48 +02:00
Nihad Abbasov
414080cb03
remove unnecessary snippets.js
2012-10-19 03:41:10 -07:00
Nihad Abbasov
c28722689d
merge graph.js into projects.js
2012-10-19 03:41:10 -07:00
Nihad Abbasov
41ec540033
remove unnecessary loader.js
2012-10-19 03:41:10 -07:00
Nihad Abbasov
57c134c39a
cleanup coffeescript code for mentions auto-complete
2012-10-19 03:41:10 -07:00
Nihad Abbasov
ec1bccb261
use 'js-' prefix for behavioral 'gfm-input' class
2012-10-19 03:41:10 -07:00
Nihad Abbasov
46921e690e
cleanup main.coffee
2012-10-19 03:41:10 -07:00
Riyad Preukschas
4fd73683d9
Update author info in tree view
2012-10-18 20:53:35 +02:00
Riyad Preukschas
aef2031ad6
Add CommitDecorator#author_link
2012-10-18 20:16:52 +02:00
Riyad Preukschas
b3a5f0a78d
Fix wrong parameter order in Team#team_member_by_name_or_email
2012-10-18 20:16:52 +02:00
Dmitriy Zaporozhets
c007325451
Merge pull request #1712 from riyad/use-gem-for-emoji
...
Use gem for Emoji
2012-10-18 00:28:47 -07:00
Riyad Preukschas
413778b645
Rename NoteObserver methods and clarify things
2012-10-18 01:14:10 +02:00
Riyad Preukschas
853c69c48a
Reorder and group methods in Notify mailer
2012-10-18 01:14:09 +02:00
Riyad Preukschas
ce91014730
Fix use of Emoji
2012-10-18 01:10:35 +02:00
randx
e0c43c46dd
Added project has_one :last_event assoc. Fixed tab line-height after font-awesome. Increased projects per page on dashboard
2012-10-17 22:02:52 +03:00
Valeriy Sizov
8e989d4863
revert all wiki changes
2012-10-17 16:14:20 +03:00
Valeriy Sizov
31f1cebe4b
Wiki style: move styles to right place
2012-10-17 15:17:27 +03:00
Valeriy Sizov
607d8b7970
Wiki Style Fixing
2012-10-17 15:09:16 +03:00
Valeriy Sizov
7166739086
Merge pull request #1715 from riyad/use-font-awesome
...
Use Font Awsome for icons
2012-10-17 03:08:12 -07:00
Valeriy Sizov
372220d35b
WebEditor: Cancel button. Confirm #1705
2012-10-17 00:27:47 +03:00
Valeriy Sizov
234eb7a8e4
WebEditor: rename button save -> commit #1705
2012-10-17 00:15:56 +03:00
Valeriy Sizov
ec05d9daf9
WebEditor: show branch #1705
2012-10-17 00:13:45 +03:00
Valeriy Sizov
d21443d1c6
Merge pull request #1713 from riyad/fix-issue-close-and-reopen-buttons
...
Fix issue close and reopen button text and styles
2012-10-16 14:05:53 -07:00
Valeriy Sizov
8ee8f36f6e
WebEditor: fix unknown theme in production mode
2012-10-16 23:52:44 +03:00
Ilya Baryshev
e6524a919e
Wiki search
...
Very basic, using LIKE, and no search snippets.
2012-10-16 23:05:11 +04:00
Riyad Preukschas
789e4b848c
Import Font Awesome styles
2012-10-16 20:48:32 +02:00
Riyad Preukschas
fa4c38f32b
Fix issues close and reopen button text and styles
2012-10-16 19:17:48 +02:00