summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add tests for Oauth::AuthorizationsControllerdz-add-oauth-controller-specDmitriy Zaporozhets2017-04-281-0/+55
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'gitter-badge' into 'master' Douwe Maan2017-04-271-0/+1
|\ | | | | | | | | gitter badge in the readme pointing to gitlabhq/gitlabhq See merge request !10968
| * gitter badge in the readme pointing to gitlabhq/gitlabhqJob van der Voort2017-04-271-0/+1
| |
* | Merge branch 'remove-invalid-services' into 'master' Douwe Maan2017-04-277-24/+51
|\ \ | | | | | | | | | | | | Remove invalid services with nil or empty type See merge request !10847
| * | tadds migration to remove invalid servicesTiago Botelho2017-04-276-25/+47
| | |
| * | remove invalid servicesTiago Botelho2017-04-262-0/+5
| | |
* | | Merge branch ↵Sean McGivern2017-04-273-1/+29
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '31292-milestone-sidebar-display-incorect-number-of-mr-when-minimized' into 'master' Resolve "Milestone sidebar display incorect number of MR when minimized" Closes #31292 See merge request !10933
| * | | [ci skip] added changelogLuke "Jared" Bennett2017-04-271-0/+4
| | | |
| * | | Added test31292-milestone-sidebar-display-incorect-number-of-mr-when-minimizedLuke "Jared" Bennett2017-04-261-0/+24
| | | |
| * | | Correct the resource counted for MR collapsed infoLuke "Jared" Bennett2017-04-261-1/+1
| | | |
* | | | Merge branch '30973-fix-network-graph-ordering' into 'master' Douwe Maan2017-04-275-7/+73
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix ordering of commits in the network graph. Closes #30973 See merge request !10936
| * | | | Add CHANGELOG entry for !1093630973-fix-network-graph-orderingTimothy Andrew2017-04-271-0/+4
| | | | |
| * | | | Fix ordering of commits in the network graph.Timothy Andrew2017-04-274-7/+69
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - We upgraded `rugged` to 0.25.1.1 in !10286 for %9.1 - Prior to this upgrade, the default sort order for commits returned by `Gitlab::Git::Repository#find_commits` was `Rugged::SORT_DATE`, which the graph relied on. - While upgrading `rugged`, the MR also changed this default to `Rugged::SORT_NONE`, which broke commit ordering in the graph. - This commit adds an option to `Gitlab::Git::Repository#find_commits` to sort by date, and changes the graph builder `Network::Graph` so it explictly requests the `:date` sort order
* | | | Merge branch '2246-uuid-is-nil-for-new-installation' into 'master' Sean McGivern2017-04-275-1/+25
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Lazily set UUID in ApplicationSetting for new installations Closes gitlab-ee#2246 See merge request !10893
| * | | Fill missing uuid on the application_settings table2246-uuid-is-nil-for-new-installationDouglas Barbosa Alexandre2017-04-262-1/+11
| | | |
| * | | Add CHANGELOGDouglas Barbosa Alexandre2017-04-261-0/+4
| | | |
| * | | Lazily sets UUID in ApplicationSetting for new installationsDouglas Barbosa Alexandre2017-04-262-0/+10
| | | |
* | | | Merge branch 'dz-add-cohort-spec' into 'master' Sean McGivern2017-04-271-0/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Increase code coverage for admin/cohorts page See merge request !10964
| * | | | Increase code coverage for admin/cohorts pagedz-add-cohort-specDmitriy Zaporozhets2017-04-271-0/+15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'sh-bump-mail-gem' into 'master' Robert Speicher2017-04-271-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update mail gem to 2.6.5 See merge request !10951
| * | | | | Update mail gem to 2.6.5sh-bump-mail-gemStan Hu2017-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should fix the extra backslashes in e-mail names as well as other things: https://github.com/mikel/mail/blob/master/CHANGELOG.rdoc#head
* | | | | | Merge branch '31202-timeago-loops' into 'master' Phil Hughes2017-04-277-98/+157
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused code Closes #31202 See merge request !10897
| * | | | | | Remove unused codeFilipa Lacerda2017-04-277-98/+157
|/ / / / / /
* | | | | | Merge branch 'environments-vue-5' into 'master' Phil Hughes2017-04-276-141/+167
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use vue files for vue components. See merge request !10882
| * | | | | | Use vue files for vue components.Filipa Lacerda2017-04-276-141/+167
|/ / / / / /
* | | | | | Merge branch 'fix-issue-template-expansion' into 'master' Rémy Coutable2017-04-271-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix checks markup in bug template See merge request !10963
| * | | | | | Fix checks markup in bug templatefix-issue-template-expansionSean McGivern2017-04-271-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Triple backticks aren't allowed inside <details> elements, so add an explicit <pre> instead.
* | | | | | | Merge branch 'tc-make-user-master-project-by-admin' into 'master' Rémy Coutable2017-04-273-1/+22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make namespace owner master of project upon creation Closes #29446 See merge request !10910
| * | | | | | | Make namespace owner master of project upon creationtc-make-user-master-project-by-adminToon Claes2017-04-273-1/+22
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | When an admin creates a project in the namespace of a user, that user automatically gains master access to that project.
* | | | | | | Merge branch '26585-remove-readme-view-caching' into 'master' Douwe Maan2017-04-2722-187/+146
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove view fragment caching for project READMEs Closes #26585 and #29594 See merge request !8838
| * | | | | | | Remove superfluous if/else branching26585-remove-readme-view-cachingToon Claes2017-04-271-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `MarkupHelper#markup` method does everything we need here.
| * | | | | | | Avoid including the MarkupHelperToon Claes2017-04-272-2/+3
| | | | | | | |
| * | | | | | | Remove the unnecessary ApplicationSetting stubbingToon Claes2017-04-271-1/+0
| | | | | | | |
| * | | | | | | Add commit to the Banzai::post_process contextToon Claes2017-04-271-2/+3
| | | | | | | |
| * | | | | | | `markdown` helper is not used with pre-rendered contentToon Claes2017-04-271-1/+1
| | | | | | | |
| * | | | | | | Remove unused optional parameter `asciidoc_opts`Toon Claes2017-04-272-27/+6
| | | | | | | |
| * | | | | | | Fix failing specsToon Claes2017-04-272-2/+2
| | | | | | | |
| * | | | | | | Make the `_unsafe` methods privateToon Claes2017-04-271-12/+12
| | | | | | | |
| * | | | | | | Single quotes in MarkupHelper where possibleToon Claes2017-04-271-9/+9
| | | | | | | |
| * | | | | | | Refactor MarkupHelperDouwe Maan2017-04-2711-99/+67
| | | | | | | |
| * | | | | | | Cache the rendered README, but post-process on showToon Claes2017-04-2711-57/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because the post-processing of the rendered README is dependent on the context (i.e. the current user), do the post-processing when the README is being displayed.
| * | | | | | | Move some methods from ApplicationHelper to MarkupHelperToon Claes2017-04-273-34/+32
| | | | | | | |
| * | | | | | | Rename GitlabMarkdownHelper -> MarkupHelperToon Claes2017-04-276-6/+6
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | It does more than solely GitLab Markdown, so rename to MarkupHelper.
* | | | | | | Merge branch '29505-allow-admins-sudo-to-blocked-users' into 'master' Rémy Coutable2017-04-273-2/+32
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | Allow admins to sudo to blocked users See merge request !10842
| * | | | | | Allow admins to sudo to blocked users.29505-allow-admins-sudo-to-blocked-usersTimothy Andrew2017-04-263-2/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Currently, (for example) admins can't delete snippets for blocked users, which is an unexpected limitation. - We modify `authenticate!` to conduct the `access_api` policy check against the `initial_current_user`, instead of the user being impersonated. - Update CHANGELOG for !10842
* | | | | | | Merge branch 'add-username-to-activity-feed' into 'master' Rémy Coutable2017-04-273-1/+6
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add username to activity atom feed Closes #31268 See merge request !10802
| * | | | | | Add username to activity atom feed (!10802)winniehell2017-04-263-1/+6
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'blackst0ne/gitlab-ce-fix_emoji_parser'Sean McGivern2017-04-278-7/+66
|\ \ \ \ \ \
| * | | | | | Fix rendering emoji inside a stringblackst0ne2017-04-258-7/+66
| | | | | | |
* | | | | | | Merge branch 'lleoni-fix-notify-post-receive'Rémy Coutable2017-04-272-1/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | See pull request https://github.com/gitlabhq/gitlabhq/pull/10429
View Lorry Controller Status