summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Only show forks for users who can download code14272-forks-listed-when-permission-is-missingSean McGivern2016-05-122-2/+4
* Merge branch '16568-relative-links-wiki-regression' into 'master' Rémy Coutable2016-05-123-3/+96
|\
| * Add CHANGELOG entry.Timothy Andrew2016-05-121-0/+3
| * Implement @rymai's feedback after review.Timothy Andrew2016-05-121-2/+10
| * Add a spec for `WikiLinkFilter`Timothy Andrew2016-05-122-3/+85
|/
* Merge branch 'issue_15572_snippets_tab_under_user_profile' into 'master' Douwe Maan2016-05-118-24/+111
|\
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into issue_15572_sni...Long Nguyen2016-05-11213-3147/+1276
| |\
| * | Code improveLong Nguyen2016-05-102-18/+19
| * | Add specs for user routing and update spec for user controllerLong Nguyen2016-05-082-0/+59
| * | Routing refactoringLong Nguyen2016-05-086-23/+20
| * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into issue_15572_sni...Long Nguyen2016-05-08181-580/+1510
| |\ \
| * | | Fix routing errorLong Nguyen2016-05-081-1/+1
| * | | user routings refactorLong Nguyen2016-05-089-32/+64
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into issue_15572_sni...Long Nguyen2016-05-05227-1341/+3520
| |\ \ \
| * | | | Remove unused view and update redirect when destroy snippetLong Nguyen2016-05-052-14/+1
| * | | | Remove unused code, update spec, and update changelogLong Nguyen2016-05-053-27/+2
| * | | | Add snippet tab under user profileLong Nguyen2016-05-024-3/+39
* | | | | Merge branch 'rs-remove-icon_for_event' into 'master' Douwe Maan2016-05-111-9/+0
|\ \ \ \ \
| * | | | | Remove unused `icon_for_event` helperRobert Speicher2016-05-111-9/+0
| | |_|_|/ | |/| | |
* | | | | Merge branch 'no-todo-badge-on-zero' into 'master' Jacob Schatz2016-05-111-2/+3
|\ \ \ \ \
| * | | | | Don't show the Todo count if there aren't any Todos.Connor Shea2016-05-101-2/+3
| |/ / / /
* | | | | Merge branch 'hook-docs-behavior' into 'master' Robert Speicher2016-05-115-6/+21
|\ \ \ \ \
| * | | | | Remove extra sanitizationJacob Vosmaer2016-05-101-1/+1
| * | | | | Fix test failuresJacob Vosmaer2016-05-092-3/+3
| * | | | | Remove spaceJacob Vosmaer2016-05-091-1/+1
| * | | | | Always mention HTTP statusJacob Vosmaer2016-05-031-1/+1
| * | | | | Inform user about questionable hook successJacob Vosmaer2016-05-031-2/+4
| * | | | | Improve documentation and web test for web hooksJacob Vosmaer2016-05-033-2/+15
* | | | | | Merge branch '17356-remove-monkey_patch' into 'master' Robert Speicher2016-05-111-48/+0
|\ \ \ \ \ \
| * | | | | | Remove Rails monkey-patches now that we're using Rails 4.2.6Rémy Coutable2016-05-111-48/+0
* | | | | | | Merge branch 'improve-destroy-logging' into 'master' Robert Speicher2016-05-111-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Improve log message when a project is destroyed to include the namespaceStan Hu2016-05-101-1/+1
* | | | | | | | Merge branch '17249-starred' into 'master' Robert Speicher2016-05-116-15/+36
|\ \ \ \ \ \ \ \
| * | | | | | | | Tidy up user project specsSean McGivern2016-05-112-14/+9
| * | | | | | | | Restrict starred projects to viewable onesSean McGivern2016-05-106-15/+41
* | | | | | | | | Merge branch '17270-only-generate-email-on-push-once-for-all-recipients' into...Robert Speicher2016-05-117-55/+83
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Only generate repository push email onceSean McGivern2016-05-117-55/+83
* | | | | | | | | | Merge branch 'update-changelog-874' into 'master' Yorick Peterse2016-05-111-3/+7
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Updated 8.7.4 CHANGELOG entriesYorick Peterse2016-05-111-3/+7
* | | | | | | | | | Merge branch 'casecmp-cop' into 'master' Rémy Coutable2016-05-114-6/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Enable Rubocop Casecmp Performance Cop.Connor Shea2016-05-104-6/+5
* | | | | | | | | | | Merge branch 'string-replacement-cop' into 'master' Rémy Coutable2016-05-112-2/+3
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Enable the StringReplacement cop.Connor Shea2016-05-102-2/+3
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'jquery-scrollto' into 'master' Jacob Schatz2016-05-113-4/+210
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | Removes jquery-scrollto-rails.Connor Shea2016-05-103-4/+210
|/ / / / / / / / /
* | | | | | | | | Merge branch 'fix-r-shortcut' into 'master' Jacob Schatz2016-05-101-0/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Restore "r" shortcutfix-r-shortcutAlfredo Sumaran2016-05-041-0/+4
* | | | | | | | | | Merge branch 'stanhu/gitlab-ce-add-eager-load-lib' into 'master' Robert Speicher2016-05-1011-191/+200
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix a few places where autoloading would failRémy Coutable2016-05-1011-190/+190
| * | | | | | | | | | Add eager load paths to help prevent dependency load issues with Sidekiq workersStan Hu2016-05-102-6/+15