summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Allow public access to some Tag API endpointspublic-tags-apiRémy Coutable2016-12-074-10/+57
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'rs-simplify-changelog-branch_name' into 'master' Rémy Coutable2016-12-021-1/+1
|\ | | | | | | | | | | | | | | Simplify `branch_name` in bin/changelog The `--short` option has existed since at least 1.8.1: https://git-scm.com/docs/git-symbolic-ref/1.8.1 See merge request !7891
| * Simplify `branch_name` in bin/changelogrs-simplify-changelog-branch_nameRobert Speicher2016-12-021-1/+1
| | | | | | | | | | The `--short` option has existed since at least 1.8.1: https://git-scm.com/docs/git-symbolic-ref/1.8.1
* | Merge branch 'rs-project-snippet-security-specs' into 'master' Rémy Coutable2016-12-023-204/+168
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Speed up project snippet security request specs Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/24899 See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7779 and https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7813 See merge request !7890
| * | Speed up project snippet security request specsrs-project-snippet-security-specsRobert Speicher2016-12-023-204/+168
| |/ | | | | | | | | | | | | Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/24899 See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7779 and https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7813
* | Merge branch 'workhorse-1.1.0' into 'master' Robert Speicher2016-12-021-1/+1
|\ \ | | | | | | | | | | | | Use gitlab-workhorse 1.1.0. Adds Prometheus support and more. See merge request !7868
| * | Use gitlab-workhorse 1.1.0Jacob Vosmaer2016-12-011-1/+1
| | |
* | | Merge branch 'update-api-spec-files' into 'master' Rémy Coutable2016-12-0238-39/+42
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update API spec files to describe the correct class by changing `API::API` to the corresponding class, for example `API::AwardEmoji`. Closes #24902 See merge request !7718
| * | | Changed API spec files to describe the correct classLivier2016-11-2838-39/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore changes for api spec files Fix error in rspec Users Delete extra space Repositories-spec
* | | | Merge branch 'doc/extend-code-review-guidelines' into 'master' Robert Speicher2016-12-021-0/+26
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Extend code review docs with chapter about the right balance [ci skip] See merge request !7838
| * | | Remove change to MWBS in code review guidelineGrzegorz Bizon2016-12-021-1/+1
| | | | | | | | | | | | | | | | [ci skip]
| * | | Copy-edit text about right balance in code reviewsdoc/extend-code-review-guidelinesGrzegorz Bizon2016-12-011-10/+10
| | | | | | | | | | | | | | | | [ci skip]
| * | | Extend code review docs with chapter about the right balanceGrzegorz Bizon2016-11-301-1/+27
| | | |
* | | | Merge branch 'remove-gitlab-workhorse-version-option-from-install-task' into ↵Robert Speicher2016-12-024-44/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Don't allow to specify a repo or version when installing Workhorse I've also updated the "patch version upgrade" doc since I did forget to update it in !6574. See merge request !7879
| * | | | Don't allow to specify a repo or version when installing Workhorseremove-gitlab-workhorse-version-option-from-install-taskRémy Coutable2016-12-014-44/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The task will use the canonical repo and the required version. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'process-commit-worker-improvements' into 'master' Douwe Maan2016-12-0212-25/+356
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass commit data to ProcessCommitWorker This changes `ProcessCommitWorker` so that it takes a Hash containing commit data instead of a commit SHA. This means the worker doesn't have to access Git just to process a commit message (and other data it may use). This in turn should solve the problem of ending up with 15 000-something jobs in the `process_commit` queue that take forever to process. See merge request !7744
| * | | | | Pass commit data to ProcessCommitWorkerprocess-commit-worker-improvementsYorick Peterse2016-12-0112-25/+356
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By passing commit data to this worker we remove the need for querying the Git repository for every job. This in turn reduces the time spent processing each job. The migration included migrates jobs from the old format to the new format. For this to work properly it requires downtime as otherwise workers may start producing errors until they're using a newer version of the worker code.
* | | | | | Merge branch '4269-public-api' into 'master' Douwe Maan2016-12-025-152/+315
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow public access to some Project API endpoints ## What does this MR do? This opens up a few endpoints in the Project API: - `GET /projects/visible` (returns public projects only) - `GET /projects/search/:query` (returns results only for public projects) - `GET /projects/:id` (only if the project is public) - `GET /projects/:id/events` (only if the project is public) - `GET /projects/:id/users` (only if the project is public) ## Are there points in the code the reviewer needs to double check? I've chosen to explicitly add `authenticate!` to GET methods that still need a current user. ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [ ] All builds are passing Part of #4269 See merge request !7843
| * | | | | | Allow public access to some Project API endpoints4269-public-apiRémy Coutable2016-12-015-152/+315
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'comments-fixture' into 'master' Alfredo Sumaran2016-12-025-44/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace static fixture for notes_spec ## What does this MR do? Replace `comments.html.haml` and `issue_note.html.haml` used in `notes_spec.js` by dynamically created fixture. ## What are the relevant issue numbers? #24753 See merge request !7683
| * | | | | | Replace static fixture for notes_spec (!7683)winniehell2016-12-015-44/+21
| | |/ / / / | |/| | | |
* | | | | | Merge branch '24726-remove-across-gitlab' into 'master' Annabel Dunstone Gray2016-12-014-7/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 24726 Remove Across GitLab from side navigation ## What does this MR do? Removes Across GitLab header from side navigation ## Screenshots (if relevant) Before: ![Screen_Shot_2016-12-01_at_11.09.12_AM](/uploads/7a8c32a1736a55e0baedf071c21e98db/Screen_Shot_2016-12-01_at_11.09.12_AM.png) After: ![Screen_Shot_2016-12-01_at_11.09.02_AM](/uploads/4d095ec6e4e756abf0301678bb40d59b/Screen_Shot_2016-12-01_at_11.09.02_AM.png) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24726 See merge request !7883
| * | | | | | 24726 Remove Across GitLab from side navigation24726-remove-across-gitlabtauriedavis2016-12-014-7/+4
| | | | | | |
* | | | | | | Merge branch '24814-pipeline-tabs' into 'master' Fatih Acet2016-12-0113-73/+393
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pipelines tabs ## What does this MR do? Changes the URL when the builds tab is clicked making it possible to be shared. 1. Adds a standard way to handle linked tabs: * This behaviour is already present in the merge requests, commit and user `show` page. * This MR introduces a reusable way to accomplish this behaviour for pages with static content. 2. Adds test: * For the linked tabs reusable class * For the pipelines tabs ## Why was this MR needed? To allow having a sharable URL that represented the opened tab ![tabs](/uploads/91e663c12c6e9ac46a17aa3a9489dc72/tabs.gif) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24814 See merge request !7709
| * | | | | | | Improvements after review24814-pipeline-tabsFilipa Lacerda2016-11-304-21/+21
| | | | | | | |
| * | | | | | | Fixes after reviewFilipa Lacerda2016-11-302-30/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix pipelines tests Fix rubocop
| * | | | | | | Adds .matches polyfillFilipa Lacerda2016-11-303-158/+193
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves matches poly to the correct file Divides pipelines index and show tests in order to be able to test with JS
| * | | | | | | Adds tests for builds url and tabs behaviourFilipa Lacerda2016-11-303-3/+89
| | | | | | | |
| * | | | | | | Fix after reviewFilipa Lacerda2016-11-304-13/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds require statement
| * | | | | | | Adds changelog entryFilipa Lacerda2016-11-301-0/+4
| | | | | | | |
| * | | | | | | Adds tests for tabs in the rspec for pipelinesFilipa Lacerda2016-11-306-9/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds tests for the Linked Tabs class Removes event listener Adds builds
| * | | | | | | Pipelines tabsFilipa Lacerda2016-11-305-5/+140
| | | | | | | |
* | | | | | | | Merge branch 'right-sidebar-fixture' into 'master' Fatih Acet2016-12-013-25/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace static fixture for right_sidebar_spec ## What does this MR do? Replace `right_sidebar.html.haml` for `right_sidebar_spec.js` by already existing dynamically generated fixture. ## What are the relevant issue numbers? #24753 See merge request !7687
| * | | | | | | | Replace static fixture for right_sidebar_spec (!7687)winniehell2016-11-283-25/+10
| | | | | | | | |
* | | | | | | | | Merge branch '22781-user-generated-permalinks' into 'master' Fatih Acet2016-12-019-93/+61
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "User-generated permalink IDs collide with GitLab interface" ## What does this MR do? Prevents ID values automatically generated by headers in [GitLab Flavored Markdown](https://github.com/gitlabhq/gitlabhq/blob/master/doc/user/markdown.md#header-ids-and-links) from colliding with IDs used elsewhere in the GitLab interface. This can cause confusion when, for instance, a selector looks for a merge request tab with `id="pipelines"` and there is a header with the same ID earlier in the DOM. How this works: * All header IDs generated with GitLab Flavored Markdown are namespaced with `id="user-content_foo"` * All anchor links which point to these IDs continue to use the non-namespaced hash `<a href="#foo">...</a>` * When a page is loaded or when the `hashchange` event is triggered, javascript will automatically search for `#user-content_foo` if `#foo` cannot be found, and scroll to that position instead. ## Before ![2016-11-21-13.00.28](/uploads/e3be2cd6a9142dfd6e64db5462a6aa76/2016-11-21-13.00.28.gif) ## After: ![2016-11-21-13.12.45](/uploads/f7ae3f3a30c91325eaa3665591b6a850/2016-11-21-13.12.45.gif) ![2016-11-21-13.03.00](/uploads/3a6a782c081ecaa05b8781548d794909/2016-11-21-13.03.00.gif) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #22781 See also prior attempts to address this issue: #3908, !2023, !2024 See merge request !7631
| * | | | | | | | | remove underscore from user-content id namespace22781-user-generated-permalinksMike Greiling2016-11-305-9/+9
| | | | | | | | | |
| * | | | | | | | | remove setTimeout wrapper for location hash correctionMike Greiling2016-11-301-3/+1
| | | | | | | | | |
| * | | | | | | | | prevent anchor tag outline on :focus or :target pseudo-classMike Greiling2016-11-301-0/+1
| | | | | | | | | |
| * | | | | | | | | update gitlab flavored markdown tests to reflect namespaced idsMike Greiling2016-11-303-12/+17
| | | | | | | | | |
| * | | | | | | | | remove id collision caveat from documentationMike Greiling2016-11-301-48/+0
| | | | | | | | | |
| * | | | | | | | | add CHANGELOG entry for !7631Mike Greiling2016-11-301-0/+4
| | | | | | | | | |
| * | | | | | | | | add transparent namespace to all user-generated anchors in GitLab flavored ↵Mike Greiling2016-11-302-6/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | markdown
| * | | | | | | | | remove duplicate functionality (bad merge conflict resolution?)Mike Greiling2016-11-302-28/+19
| | | | | | | | | |
* | | | | | | | | | Merge branch ↵Fatih Acet2016-12-018-72/+64
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '24281-issue-merge-request-sidebar-subscribe-button-style-improvement' into 'master' Remove the help text under the sidebar subscribe button and style it inline ## What does this MR do? Remove the help text under the sidebar subscribe button and style it inline ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Current help text is over obvious and pushes references too far down. Also the subscribe button is now consistently styled and not a complete block button anymore. approved by @awhildy ## Screenshots (if relevant) before: ![image](/uploads/0c9543d2bf184a73b65773caa5f9fc62/image.png) after: ![image](/uploads/765338823376267427f4a16737e39998/image.png) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24281 See merge request !7389
| * | | | | | | | | | remove selector string option from Subscription constructor24281-issue-merge-request-sidebar-subscribe-button-style-improvementMike Greiling2016-12-011-5/+3
| | | | | | | | | | |
| * | | | | | | | | | use HTMLElement.dataset over getAttribute since all browsers GitLab supports ↵Mike Greiling2016-12-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | implement it
| * | | | | | | | | | remove tooltip logicMike Greiling2016-11-301-7/+1
| | | | | | | | | | |
| * | | | | | | | | | satisfy eslint no-param-reassign and remove rule exceptionMike Greiling2016-11-301-4/+4
| | | | | | | | | | |
| * | | | | | | | | | add comma to satisfy eslint comma-dangleMike Greiling2016-11-301-1/+1
| | | | | | | | | | |
| * | | | | | | | | | use less error-prone lowercase comparison for isSubscribedMike Greiling2016-11-301-1/+1
| | | | | | | | | | |