- 24 Aug, 2016 3 commits
-
-
Stan Hu authored
8-11-stable-ee to master See merge request !686
-
Ruben Davila authored
-
Ruben Davila authored
Conflicts: app/assets/javascripts/application.js app/assets/javascripts/boards/boards_bundle.js.es6 app/assets/javascripts/boards/components/board.js.es6 app/assets/javascripts/boards/components/board_list.js.es6 app/assets/javascripts/boards/mixins/sortable_default_options.js.es6 app/assets/javascripts/boards/models/label.js.es6 app/assets/javascripts/labels_select.js app/assets/javascripts/protected_branch_access_dropdown.js.es6 app/assets/stylesheets/pages/boards.scss app/assets/stylesheets/pages/builds.scss app/assets/stylesheets/pages/pipelines.scss app/controllers/projects/boards/issues_controller.rb app/controllers/projects/merge_requests_controller.rb app/helpers/blob_helper.rb app/helpers/ci_status_helper.rb app/models/ci/pipeline.rb app/models/diff_note.rb app/models/note.rb app/models/project.rb app/views/discussions/_diff_with_notes.html.haml app/views/projects/boards/components/_board.html.haml app/views/projects/boards/components/_card.html.haml app/views/projects/ci/pipelines/_pipeline.html.haml app/views/projects/merge_requests/widget/_open.html.haml app/views/projects/notes/_hints.html.haml app/views/projects/protected_branches/_create_protected_branch.html.haml app/views/shared/issuable/_filter.html.haml app/views/shared/issuable/_form.html.haml app/views/shared/issuable/_label_page_default.html.haml config/application.rb db/schema.rb doc/user/project/protected_branches.md features/steps/project/merge_requests.rb spec/controllers/autocomplete_controller_spec.rb spec/controllers/projects/discussions_controller_spec.rb spec/features/boards/boards_spec.rb spec/features/protected_branches/access_control_ee_spec.rb spec/features/protected_branches_spec.rb spec/fixtures/api/schemas/issue.json spec/lib/ee/gitlab/ldap/sync/group_spec.rb spec/workers/elastic_indexer_worker_spec.rb
-
- 23 Aug, 2016 23 commits
-
-
Ruben Davila authored
-
Ruben Davila authored
-
Achilleas Pipinellis authored
Doc slash commands loc See merge request !678
-
Achilleas Pipinellis authored
Additional documentation on protected branches for EE See merge request !677
-
Ruben Davila authored
-
Achilleas Pipinellis authored
Change slash commands docs location See merge request !5937
-
Achilleas Pipinellis authored
Document protected branches new behavior See merge request !5934
-
Achilleas Pipinellis authored
Documentation for Issue Boards ## What does this MR do? Add documentation for issue boards. ## What are the relevant issue numbers? - Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/17907 - Backend MR: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5548 - Frontend MR: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5554 See merge request !5713
-
Achilleas Pipinellis authored
Split Koding admin/user docs Backend/Frontend MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5909 See merge request !5938
-
Robert Speicher authored
Add Ruby 2.3 upgrade notes. The 8.10 to 8.11 docs didn't mention Ruby 2.3, now they do. See merge request !5940
-
Robert Speicher authored
Fix location of markdown help Resolves #21208, and incorrect link to the markdown style guide See merge request !5945
-
Robert Speicher authored
Fix for update 8.10-to-8.11.md doc. Fixed a typo in the docs to update Ruby. See merge request !5941
-
Robert Speicher authored
Remove tab stop from issuable form added by description templates See merge request !5929
-
Yorick Peterse authored
Fix typo in gitlab-workhorse header See merge request !5891
-
Robert Speicher authored
Bump SimpleCov merge timeout to 365 days ## What does this MR do? In case that CI pipeline fails because of intermittent errors in one of the jobs, when someone retries the only failing job located in the middle stage, the job that calculates compound coverage that is configured in later stage, and triggered after retrying job in the pipeline, will still return an accurate coverage value. Closes #21144 See merge request !5932
-
Jacob Schatz authored
Fixed enter key in search input not working ## What does this MR do? Fixes a bug where the enter key wouldn't search in the top nav search input Closes #20627 See merge request !5888
-
Robert Speicher authored
Fix project namespace links #### What does this MR do? Fixes pipeline links #### Why was this MR needed? Links went to a 404 on fork MR pipelines tab #### What are the relevant issue numbers? Closes #21107 See merge request !5912
-
Robert Speicher authored
Fix incorrect "stopped impersonation" log message Minor bug: Usernames were swapped in the log message. Closes #21015 See merge request !5949
-
Robert Speicher authored
Also check if Akismet is enabled, before showing the `Submit as spam` button. Fixes #21229 See merge request !5948
-
Robert Speicher authored
Fix Spinach branches spec I broke master by adding a branch to gitlab-test for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5961, which put the branch in this scenario off the first page
😆 See merge request !5964 -
Douwe Maan authored
Fix file links on project page Files view ## What does this MR do? Fix the project show page when the default view is set to Files so that the links work. ## Are there points in the code the reviewer needs to double check? I can't figure out what caused this to break
😕 ## What are the relevant issue numbers? Closes https://gitlab.com/gitlab-com/support-forum/issues/959. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) (N/A) - [x] API support added (N/A) - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5933 -
Achilleas Pipinellis authored
Fix typo in gitlab_flow.md See merge request !674
-
Stan Hu authored
typo: won't -> want See merge request !680
-
- 22 Aug, 2016 14 commits
-
-
Andy Li authored
-
Achilleas Pipinellis authored
Split Koding admin/user docs From CE https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5938 See merge request !679
-
Achilleas Pipinellis authored
-
Achilleas Pipinellis authored
-
Achilleas Pipinellis authored
Doc slash commands loc See merge request !678
-
Achilleas Pipinellis authored
Additional documentation on protected branches for EE See merge request !677
-
Achilleas Pipinellis authored
-
Achilleas Pipinellis authored
-
Achilleas Pipinellis authored
-
Marin Jankovski authored
-
Achilleas Pipinellis authored
-
Marin Jankovski authored
-
Achilleas Pipinellis authored
-
Marin Jankovski authored
-