summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | 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
| * | | | | | | | | | | | Wrong method call on notify_post_receive.Luigi Leoni2017-04-272-1/+5
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch '30645-show-pipeline-events-description' into 'master' Kamil Trzciński2017-04-272-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove description for build_events, add pipeline_events Closes #30645 See merge request !10908
| * | | | | | | | | | | | | Remove description for build_events, add pipeline_events30645-show-pipeline-events-descriptionLin Jen-Shin2017-04-252-2/+6
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch ↵Phil Hughes2017-04-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '31475-issue-boards-sidebar-milestone-dropdown-title-has-a-typo' into 'master' Fix typo found in issue board sidebar milestone dropdown Closes #31475 See merge request !10950
| * | | | | | | | | | | | | Fix typo found in issue board sidebar milestone dropdown31475-issue-boards-sidebar-milestone-dropdown-title-has-a-typoClement Ho2017-04-261-1/+1
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'patch-16' into 'master' Achilleas Pipinellis2017-04-271-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update troubleshooting section Closes #13479 See merge request !10618
| * | | | | | | | | | | | | Update bamboo.md, the troubleshooting sectionIslam Wazery2017-04-261-5/+5
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'patch-18' into 'master' Achilleas Pipinellis2017-04-271-10/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | don't require no_root_squash on NFS, only recommend See merge request !10197
| * | | | | | | | | | | | | | don't require no_root_squash on NFS only recommendBen Bodenmiller2017-04-131-10/+9
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'patch-21' into 'master' Achilleas Pipinellis2017-04-271-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clarify when GitLab pages requires special config for load balancer See merge request !10954
| * | | | | | | | | | | | | | special pages config only needed for custom domain supportBen Bodenmiller2017-04-271-1/+2
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'backport-cyclomatic_complexity-fix' into 'master' Douwe Maan2017-04-261-18/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Rubocop CyclomaticComplexity offense See merge request !10941
| * | | | | | | | | | | | | | Fix Rubocop CyclomaticComplexity offensebackport-cyclomatic_complexity-fixRémy Coutable2017-04-261-18/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | | Merge branch '30466-click-x-to-remove-filter' into 'master' Jacob Schatz2017-04-268-21/+145
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add button to delete filters from filtered search bar Closes #30466 See merge request !10795
| * | | | | | | | | | | | | | Add button to delete filters from filtered search barClement Ho2017-04-268-21/+145
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch '31458-fix-rubocop-failure' into 'master' Rémy Coutable2017-04-261-17/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a failing Rubocop rule on master Closes #31458 See merge request !10947
| * | | | | | | | | | | | | | Fix a failing Rubocop rule on masterDouglas Barbosa Alexandre2017-04-261-17/+21
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'gl-version-backup-file' into 'master' Rémy Coutable2017-04-264-116/+146
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add GitLab version to backup file name See merge request !10901
| * | | | | | | | | | | | | | | Fix failing specgl-version-backup-fileAchilleas Pipinellis2017-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://rubular.com/r/op7TI9UX6K
| * | | | | | | | | | | | | | | Refactor backup/restore docsAchilleas Pipinellis2017-04-252-114/+144
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Expose GitLab version in backup fileAchilleas Pipinellis2017-04-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of doing hacks like http://stackoverflow.com/a/26082612/974710
* | | | | | | | | | | | | | | | Merge branch 'dm-sidekiq-5' into 'master' Stan Hu2017-04-263-5/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump Sidekiq to 5.0.0 See merge request !10943
| * | | | | | | | | | | | | | | | Bump Sidekiq to 5.0.0dm-sidekiq-5Douwe Maan2017-04-263-5/+9
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'opt-out-not-in' into 'master' Sean McGivern2017-04-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | correct documentation on opt-out-ness of usage ping See merge request !10945
| * | | | | | | | | | | | | | | correct documentation on opt-out-ness of usage pingopt-out-not-inJob van der Voort2017-04-261-1/+1
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch '31335-job-dropdown' into 'master' Phil Hughes2017-04-265-64/+114
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Jobs dropdown in mini graph should close when we receive an error" Closes #31335 See merge request !10887
| * | | | | | | | | | | | | | | Resolve "Jobs dropdown in mini graph should close when we receive an error"Filipa Lacerda2017-04-265-64/+114
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'zj-dockerfiles' into 'master' Douwe Maan2017-04-2610-4/+70
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Submodule Dockerfile templates See merge request !10663
View Lorry Controller Status