summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Fix broken file browsing with relative submodule in personal projectsStan Hu2015-04-231-1/+1
* Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-04-223-74/+74
|\
| * added fieldset support to project and admin services views.Ioannis Kappas2015-04-223-74/+74
* | Merge branch 'rs-reply-hotkey' into 'master'Dmitriy Zaporozhets2015-04-227-23/+68
|\ \ | |/ |/|
| * Typo: Issueable -> IssuableRobert Speicher2015-04-183-4/+4
| * Add JS specs for replyWithSelectedTextRobert Speicher2015-04-181-0/+3
| * Add hotkey for "reply with selected text" to IssueableRobert Speicher2015-04-181-1/+27
| * Add 'reply' hotkey to help modalRobert Speicher2015-04-181-0/+8
| * Make StatGraph JS explicitly require its dependenciesRobert Speicher2015-04-182-0/+8
| * Fix 'merge_reuests' typoRobert Speicher2015-04-182-2/+2
* | Merge branch 'rs-issue-2257' into 'master'Dmitriy Zaporozhets2015-04-221-4/+8
|\ \
| * | Recover from all `URI::Error`sRobert Speicher2015-04-211-4/+8
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2015-04-221-2/+2
|\ \ \
| * | | Fix tab behavior on MergeRequests#newrs-toggle-tabRobert Speicher2015-04-211-2/+2
| |/ /
* | | Merge pull request #9164 from dsander/fix-markdown-previewJeroen van Baarsen2015-04-221-1/+1
|\ \ \
| * | | Make issue preview look like the resultDominik Sander2015-04-211-1/+1
* | | | do not send empty message to hipchatChulki Lee2015-04-221-2/+3
| |/ / |/| |
* | | Merge branch 'rs-reference-filters' into 'master'Dmitriy Zaporozhets2015-04-214-6/+19
|\ \ \
| * | | Escape title attributes in referencesRobert Speicher2015-04-202-2/+6
| * | | Begin cleaning out spec/helpers/gitlab_markdown_helper_specRobert Speicher2015-04-201-0/+1
| * | | Remove duplicate ampersand from Label title format validatorRobert Speicher2015-04-201-1/+1
| * | | Reference filters :sparkles:Robert Speicher2015-04-202-5/+13
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-214-4/+29
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge branch 'google-code-fixes' into 'master'Dmitriy Zaporozhets2015-04-212-4/+26
| |\ \ \
| | * | | Improve description of Google Code import user map.Douwe Maan2015-04-211-3/+25
| | * | | Fix redirect when trying to view invalid Google Code import status.Douwe Maan2015-04-211-1/+1
| | |/ /
| * | | Merge branch 'fix-cannot-move-project-error' into 'master'Douwe Maan2015-04-212-0/+3
| |\ \ \ | | |/ / | |/| |
| | * | Fix "Cannot move project" error message from popping up after a successful pr...Stan Hu2015-04-202-0/+3
| | |/
* | | Fixed the Rails/ActionFilter copJeroen van Baarsen2015-04-2064-195/+195
|/ /
* | Merge pull request #9075 from Soullivaneuh/bootlintDmitriy Zaporozhets2015-04-202-0/+5
|\ \
| * | Bootlint integrationSullivan SENECHAL2015-04-012-0/+5
* | | Merge branch 'better-commit-mentions' into 'master'Dmitriy Zaporozhets2015-04-209-40/+60
|\ \ \
| * | | Clean up code somewhat.better-commit-mentionsDouwe Maan2015-04-174-26/+24
| * | | Fix Snippet#participants.Douwe Maan2015-04-153-0/+4
| * | | Only send note notifications to people accessible by the note author.Douwe Maan2015-04-151-2/+2
| * | | Include snippet author in recipients of snippet note notification.Douwe Maan2015-04-151-0/+12
| * | | Clean up code around commit mentions.Douwe Maan2015-04-157-24/+30
* | | | improve new project optionsBen Bodenmiller2015-04-201-6/+5
* | | | Merge branch 'haynes/gitlab-ce-remove_access_control_for_images' into 'master'Dmitriy Zaporozhets2015-04-201-7/+28
|\ \ \ \
| * | | | Explain skip_before_filter workaround.haynes/gitlab-ce-remove_access_control_for_imagesDouwe Maan2015-04-171-2/+5
| * | | | Correctly handle blocked users.Douwe Maan2015-04-171-15/+14
| * | | | remove access control for imagesHannes Rosenögger2015-04-161-6/+25
* | | | | Merge pull request #9150 from digitalmediacenter/masterJeroen van Baarsen2015-04-201-1/+1
|\ \ \ \ \
| * | | | | do not prepend relative_url_root to avatarLeo Antunes2015-04-201-1/+1
* | | | | | Merge branch 'fix-label-color-input' into 'master'Dmitriy Zaporozhets2015-04-202-1/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix label color input.fix-label-color-inputDouwe Maan2015-04-172-1/+3
| | |_|_|/ | |/| | |
* | | | | Merge branch 'rs-issue-2219' into 'master'Dmitriy Zaporozhets2015-04-192-11/+3
|\ \ \ \ \
| * | | | | Let Bootstrap's tab JS handle historyRobert Speicher2015-04-172-11/+3
| |/ / / /
* | | | | Merge branch 'rs-issue-2212' into 'master'Dmitriy Zaporozhets2015-04-192-22/+36
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Loosen help page parameter constraints for categoryRobert Speicher2015-04-151-1/+1