Dmitriy Zaporozhets
d2d566b162
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2013-07-10 13:49:29 +03:00
Dmitriy Zaporozhets
8dd6af1466
Sanitize user attrs on model level
2013-07-10 13:48:50 +03:00
Kevin Wong
1da67c2cec
Fix header text for setting greatest team access to a project
2013-07-09 10:42:35 -06:00
Dmitriy Zaporozhets
cefd8fe2fa
Merge branch 'rename-support-forum-to-mailing-list' of /home/git/repositories/gitlab/gitlabhq
2013-07-08 06:29:14 +00:00
Sytse Sijbrandij
c64ee6ac33
Rename support forum to mailing list to prevent duplication on community page of GitLab.org.
2013-07-07 11:30:31 +02:00
Yves Senn
cab2ba0af3
Merge pull request #4476 from tstone2077/master
...
Updating documentation to reflect #3836 (resolving #4443 )
2013-07-04 04:28:53 -07:00
dekimsey
b8f51acf7b
Fix misspelling in social accounts tip
2013-07-03 13:34:23 -04:00
Dmitriy Zaporozhets
66e10f0566
Fix header avatar
2013-07-02 11:42:39 +03:00
GitLab
015d8da731
Updating documentation to reflect #3836 (resolving #4443 )
2013-07-01 21:14:39 -05:00
Jack Weeden
6fa06893e9
Add editable notes feature
2013-07-01 10:48:25 +01:00
Jack Weeden
af81ff4e09
Changed 'javascript:;' links to '#'
2013-07-01 10:48:02 +01:00
Jack Weeden
22c00e6462
Removed before_filter as authentication is done within update method
2013-07-01 10:48:02 +01:00
Jack Weeden
1216a62e3b
Authorize user on note update
2013-07-01 10:48:02 +01:00
Jack Weeden
20b2a0b235
Ability to edit comments
2013-07-01 10:48:02 +01:00
Jack Weeden
6a84d92672
Added update and delete_attachment actions to note controller
2013-07-01 10:47:39 +01:00
Jack Weeden
5ffc90d90d
Merge remote-tracking branch 'upstream/master'
2013-07-01 10:43:01 +01:00
Dmitriy Zaporozhets
315d4cc8e8
Merge pull request #4415 from jackbot/master
...
Couple of UI additions
2013-06-30 09:32:47 -07:00
Dmitriy Zaporozhets
9b181dc649
Merge pull request #4442 from 1ed/projects-helper-fix
...
fixed nav bar for empty repos (fixes #4375 )
2013-06-30 09:32:04 -07:00
Dmitriy Zaporozhets
d9c02f30e5
Merge pull request #4460 from tstone2077/feature_help_markdown
...
Adding detailed documentation of the markdown syntax.
2013-06-30 01:22:21 -07:00
Scott Pustay and Ariejan de Vroom
2000f013f7
fixed typo in assgned
2013-06-29 16:37:41 +03:00
Thurston Stone and Thurston Stone
2a601d26f2
Adding detailed documentation of the markdown syntax.
...
This includes standard markdown as well as GitLab extended markdown as well as references to documents used.
2013-06-29 00:44:24 -05:00
Gábor Egyed
45ecbb0358
fixed nav bar for empty repos ( fixes #4375 )
2013-06-26 22:11:41 +02:00
Izaak Alpert
d1da45e1a3
Rebasing on master
...
Change-Id: Iad49f225f23675b843457df5d6965c7cd50e99a3
2013-06-26 11:08:55 -04:00
Izaak Alpert
c1b05e7b86
Gravatar image fixes when gravatar unavailable
...
-Alt text to image was set to hash, which would make the page display hashes if the image/gravatar wasn't available, set the alt text to '', and made the main tool bar image follow the same or similar constraints as the other images (.avatar, .s26)
Conflicts:
app/assets/stylesheets/themes/ui_bb.scss
app/views/snippets/_snippet.html.haml
Change-Id: I42e1e86f535486fd2556d4b3e4591f3676eea033
2013-06-26 08:53:03 -04:00
Dmitriy Zaporozhets
579c0b9791
Merge pull request #4393 from dosire/scrum-improvements
...
Rename unspecified to make it clearer and in line with scrum terminology
2013-06-25 23:24:38 -07:00
Dmitriy Zaporozhets
f7199bb1fb
Merge pull request #4361 from kenips/master
...
Add missing assigned_to renaming to merge_requests_load_context
2013-06-25 22:12:29 -07:00
vagrant
52feefb8e1
Merge remote-tracking branch 'upstream/master'
2013-06-25 09:05:02 +00:00
Jack Weeden
c00917e48f
Don't show 'Filter by labels' text if there are no labels
...
Don't show project search form if there are no projects
2013-06-25 09:49:09 +01:00
Jack Weeden
82271e7818
Added tooltip to snippet public/private icons
2013-06-24 23:57:26 +01:00
Jack Weeden
1aeebdf681
Added delete button to snippet view
2013-06-24 23:55:37 +01:00
Dmitriy Zaporozhets
884498c59f
Merge pull request #4410 from senny/dont_console_log_in_code
...
we should not use `console.log` in production code...
2013-06-24 08:43:53 -07:00
Yves Senn
f3a9240237
we should not use console.log in production code...
2013-06-24 17:40:23 +02:00
Javier Castro
cf35d19c2e
Show participants on issues, including mentions, and notify email to all participants
2013-06-24 11:55:44 -03:00
Sytse Sijbrandij
ef629ab47e
Rename unspecified to make it clearer and in line with scrum terminology.
2013-06-22 17:19:00 +02:00
Ken Ip
ed25ddca7a
Fix missing assigned_to renaming in 2e839ce
...
fixes #4360 .
2013-06-20 13:21:04 -04:00
Dmitriy Zaporozhets
d899fcdd2d
Merge pull request #4325 from zzet/patch-1
...
Remove unused but slow code
2013-06-18 11:31:17 -07:00
Dmitriy Zaporozhets
cc5440e82a
Use navless layout for snippets page
2013-06-18 17:43:49 +03:00
Dmitriy Zaporozhets
68b601f6af
Fix Issue.open_for
2013-06-17 20:00:50 +03:00
Andrew Kumanyaev
26994b5d30
Remove unused, but slow code
2013-06-17 15:52:54 +04:00
Dmitriy Zaporozhets
2e839cee93
Fixed tests. Fixed overrided scope. Better usability for milestone view
2013-06-17 11:57:37 +03:00
Dmitriy Zaporozhets
b1bdd82992
Merge pull request #4269 from dosire/scrum-view-for-milestone
...
Scrum view style milestone view.
2013-06-16 23:32:09 -07:00
Dmitriy Zaporozhets
940c05086e
Check for existing MR only for opened/reopened MR
2013-06-14 17:19:26 +03:00
Dmitriy Zaporozhets
e7c930a55b
Add imported boolean to project. Prevent shell from creating repo after it was imported
2013-06-14 16:30:48 +03:00
Dmitriy Zaporozhets
da98cebc5b
Merge pull request #4314 from Undev/feature/redesign_forms
...
Switch form from table to plain form without member list
2013-06-14 05:20:22 -07:00
Dmitriy Zaporozhets
a59fe739fe
IMprove MR validation logic
2013-06-14 15:17:47 +03:00
Sytse Sijbrandij
f7ea649f4b
Implement (style) suggestions.
2013-06-14 14:13:14 +02:00
Dmitriy Zaporozhets
977146f568
Prevent creating several open merge requests for same branches
2013-06-14 15:03:22 +03:00
Andrey Kumanyaev
815c186b29
Switch for from table to plain form without member list
2013-06-14 15:08:21 +04:00
Dmitriy Zaporozhets
1cbfc8d0af
Fix tab tests. Prevent 500 if user.last_sign_in_at is nil
2013-06-14 08:37:55 +03:00
Dmitriy Zaporozhets
74c8a635ce
Move project nav checks to helper
2013-06-13 22:58:27 +03:00