summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | Merge branch '35643-impersonate-spec' into '9-4-stable-patch-2'cherry-pick-41db362cRémy Coutable2017-07-281-1/+3
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Impersonation Tokens creation spec failure in admin_users_impersonation_tokens_spec.rb" See merge request !13145
* | | | | | | | | | | Merge branch 'inline-js-removal-projects-other' into 'master'Phil Hughes2017-07-3113-113/+140
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inline js removal projects other See merge request !13075
| * | | | | | | | | | | Moved the duplicate Available Refs to a default in RefSelectDropdowninline-js-removal-projects-otherTim Zallmann2017-07-282-3/+4
| | | | | | | | | | | |
| * | | | | | | | | | | Updated Event Handlers based on MR discussionTim Zallmann2017-07-281-8/+8
| | | | | | | | | | | |
| * | | | | | | | | | | Left a bracket in the line :-/Tim Zallmann2017-07-271-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Fixed the strange escapingTim Zallmann2017-07-271-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Maybe that fixes the escaping in the URLTim Zallmann2017-07-271-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Revert "Due to more async loading the tests could fail, trying to fix it ↵Tim Zallmann2017-07-271-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with wait_for_requests" This reverts commit 0c33f384bb2fd2bd97efa4d3fec2888393683fb1.
| * | | | | | | | | | | Due to more async loading the tests could fail, trying to fix it with ↵Tim Zallmann2017-07-271-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wait_for_requests
| * | | | | | | | | | | Fixes New Project BugTim Zallmann2017-07-273-5/+5
| | | | | | | | | | | |
| * | | | | | | | | | | Converted Pipelines ChartsTim Zallmann2017-07-274-50/+47
| | | | | | | | | | | |
| * | | | | | | | | | | TreeContent moved to external JSTim Zallmann2017-07-272-7/+4
| | | | | | | | | | | |
| * | | | | | | | | | | Moved Inline JS for Pipelines Charts + new Pipeline to dispatcherTim Zallmann2017-07-275-5/+39
| | | | | | | | | | | |
| * | | | | | | | | | | Changed the data for New Tag to a script blockTim Zallmann2017-07-272-6/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Inline JS of Wiki Sidebar to dispatcherTim Zallmann2017-07-272-3/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Set New Tags to ignore Inline JSTim Zallmann2017-07-271-0/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Project New moved to external FileTim Zallmann2017-07-273-43/+46
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch '35672-edge-top-bar' into 'master'Phil Hughes2017-07-312-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix top bar in jobs view for microsoft edge Closes #35672 See merge request !13175
| * | | | | | | | | | | | Fix top bar in jobs view for microsoft edge35672-edge-top-barFilipa Lacerda2017-07-292-0/+5
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'protobuf-bump' into 'master'Sean McGivern2017-07-311-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump google-protobuf to 3.3.0 See merge request !13172
| * | | | | | | | | | | | Bump google-protobuf to 3.3.0protobuf-bumpMatija Čupić2017-07-291-1/+1
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'fix/sm/schema-fix-group-pipeline-schedule-variables' into 'master'Sean McGivern2017-07-311-10/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix db/schema.rb for ci_group_variables and ci_pipeline_schedule_variables See merge request !13161
| * | | | | | | | | | | | fixfix/sm/schema-fix-group-pipeline-schedule-variablesShinya Maeda2017-07-291-10/+10
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch '34870-move-performance-bar-to-top' into 'master'Phil Hughes2017-07-3116-24/+111
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves the Performance Bar to the top instead of being at the bottom Closes #35019 and #34870 See merge request !12946
| * | | | | | | | | | | | Moves the Performance Bar to the top instead of being at the bottomRémy Coutable2017-07-3116-24/+111
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'gitaly-398-git-garbage-collect' into 'master'Sean McGivern2017-07-313-12/+97
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate GitGarbageCollectWorker to Gitaly Closes gitaly#398 See merge request !12975
| * | | | | | | | | | | Migrate GitGarbageCollectWorker to Gitalygitaly-398-git-garbage-collectKim "BKC" Carlbäcker2017-07-283-12/+97
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch '35567-fix-relative-urls-in-webpack-public-path' into 'master'Douwe Maan2017-07-312-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix relative_url_root support for webpack chunks Closes #35567 See merge request !13165
| * | | | | | | | | | | | add CHANGELOG.md entry for !1316535567-fix-relative-urls-in-webpack-public-pathMike Greiling2017-07-281-0/+5
| | | | | | | | | | | | |
| * | | | | | | | | | | | fix relative_url_root support for webpack chunksMike Greiling2017-07-281-1/+3
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'fix-user-creation-doc' into 'master'Achilleas Pipinellis2017-07-311-20/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update documentation of user creation by replacing the 'confirm' param with 'skip_confirmation' Closes #35614 See merge request !13160
| * | | | | | | | | | | | | Update documentation of user creation by replacing the 'confirm' param with ↵Dan Dunckel2017-07-281-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'skip_confirmation'
* | | | | | | | | | | | | | Merge branch 'sh-aws-efs-docs' into 'master'Achilleas Pipinellis2017-07-311-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a note about EFS and GitLab log files See merge request !13180
| * | | | | | | | | | | | | Add a note about EFS and GitLab log filessh-aws-efs-docsStan Hu2017-07-301-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | Merge branch ↵Clement Ho2017-07-282-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '35044-projects-logo-are-not-centered-vertically-on-projects-page' into 'master' Projects logo are not centered vertically on projects page Closes #35044, #31753, and #35546 See merge request !13124
| * | | | | | | | | | | | | Projects logo are not centered vertically on projects pageFlorian Lemaitre2017-07-282-0/+8
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch '35599-fix-uncontrolled-default_url_options-overriding' into ↵Robert Speicher2017-07-287-21/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Ensure Gitlab.config.gitlab.host/port and Gitlab::Application.routes.default_url_options are set correctly in Capybara + :js specs Closes #35599 See merge request !13126
| * | | | | | | | | | | | Fix a spec that was assuming to be on the wrong page35599-fix-uncontrolled-default_url_options-overridingRémy Coutable2017-07-281-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | | Ensure Gitlab::Application.routes.default_url_options are set correctly in ↵Rémy Coutable2017-07-286-15/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Capybara + :js specs Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | Merge branch 'rs-fix-master' into 'master'Robert Speicher2017-07-281-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix spec/features/projects/branches_spec See merge request !13163
| * | | | | | | | | | | | | Fix spec/features/projects/branches_specRobert Speicher2017-07-281-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8666
* | | | | | | | | | | | | | Merge branch 'ux-guide-search-filter-sort' into 'master'Rémy Coutable2017-07-281-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add copy about search terms to ux guide See merge request !10267
| * | | | | | | | | | | | | | Add copy about search terms to ux guidetauriedavis2017-07-281-0/+8
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'docs/jira-article' into 'master'Marcia Ramos2017-07-281-8/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add link to JIRA article in docs Closes #35046 See merge request !13154
| * | | | | | | | | | | | | | Add link to JIRA article in docsdocs/jira-articleAchilleas Pipinellis2017-07-281-8/+13
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'docs/ci-only-except' into 'master'Marcia Ramos2017-07-281-4/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explain all possible values of 'only' and 'except' Closes #34119 See merge request !13138
| * | | | | | | | | | | | | | | Explain all possible values of 'only' and 'except'docs/ci-only-exceptAchilleas Pipinellis2017-07-281-4/+17
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'dm-large-push-performance' into 'master'Robert Speicher2017-07-284-16/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Load and process at most 100 commits when pushing into default branch Closes #35531 See merge request !13132
| * | | | | | | | | | | | | | | Load and process at most 100 commits when pushing into default branchDouwe Maan2017-07-284-16/+29
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'fix-replying-to-commit-comment-in-mr-from-fork' into 'master'Douwe Maan2017-07-287-3/+123
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix replying to commit comments on merge requests created from forks Closes #31772 See merge request !13137