summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Include ldap troubleshooting steps for blocked usersadd-doc-on-ldap-troubleshootingKelvin2016-07-271-0/+34
|
* Merge branch '20025-empty-project-does-not-show-repository' into 'master' Rémy Coutable2016-07-273-0/+42
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Empty project page does not show Repository section on navbar after creating first branch/file" This MR aims to fix the rendering of the project's page after creating a README/LICENSE/.gitignore and creating the first branch of the project on the website. Pictures related with the problem this MR fixes linked in #20025 - [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) - [x] API support added - Tests - [x] Added for this feature/bug - [x] 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) Closes #20025 See merge request !5399
| * Respective cache is now expired when creating a new branchtiagonbotelho2016-07-273-0/+42
|/ | | | | | | Project and branch cache is expired when project is still empty or new branch is created. develops tests accordingly Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'memoize-note-editable' into 'master' Yorick Peterse2016-07-2712-64/+233
|\ | | | | | | | | Optimize maximum user access level lookup in loading of notes See merge request !5412
| * Add a spec for access_for_user_idsStan Hu2016-07-261-0/+12
| |
| * Fix typo in commentStan Hu2016-07-261-1/+1
| |
| * Rubocop offensesStan Hu2016-07-261-8/+8
| |
| * Optimize the invited group link access level checkStan Hu2016-07-262-19/+33
| |
| * Incorporate review commentsStan Hu2016-07-265-10/+12
| |
| * Optimize maximum user access level lookup in loading of notesStan Hu2016-07-2610-53/+194
| | | | | | | | | | | | | | | | NotesHelper#note_editable? and ProjectTeam#human_max_access currently take about 16% of the load time of an issue page. This MR preloads the maximum access level of users for all notes in issues and merge requests with several queries instead of one per user and caches the result in RequestStore.
* | Merge branch '14584-remove-routes-that-we-do-not-use-anymore' into 'master' Rémy Coutable2016-07-275-29/+11
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Remove routes that we do not use anymore" _Originally opened at !4059 by @strzibny._ - - - ## What does this MR do? > I tried to clean up the routes as mentioned in #14584 I used the following script and manually verified the changes: https://gist.github.com/strzibny/4ccbda7dcf67ef6719dcb047014e1ea7 After this patch, the script still gives me the following routes: Unused routes (7): oauth/authorizations#show doorkeeper/tokens#create doorkeeper/tokens#revoke oauth/applications#edit oauth/applications#show doorkeeper/token_info#show omniauth_callbacks#(?-mix:(?!)) Here is a relevant code from doorkeeper on drawing these routes: https://github.com/doorkeeper-gem/doorkeeper/blob/5ea4575863781940fe6996692c6b41f2ad71d90e/lib/doorkeeper/rails/routes.rb#L25 ## What are the relevant issue numbers? Closes #14584. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] 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 !5499
| * | Remove useless new route14584-remove-routes-that-we-do-not-use-anymoreRémy Coutable2016-07-271-1/+1
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | Add route for Import::GithubController#newRémy Coutable2016-07-261-1/+1
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | Add a CHANGELOG entryRémy Coutable2016-07-261-0/+1
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | Clean up unused routesJosef Strzibny2016-07-264-31/+12
| | |
* | | Merge branch 'update-gitlab-shell-version-in-doc' into 'master' Rémy Coutable2016-07-271-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update gitlab-shell version to 3.2.1 in the 8.9->8.10 update guide ## What does this MR do? Update gitlab-shell version to 3.2.1 in the 8.9->8.10 update guide (missing from gitlab-org/gitlab-ce!5509). See merge request !5516
| * | | Update gitlab-shell version to 3.2.1 in the 8.9->8.10 update guideupdate-gitlab-shell-version-in-docRémy Coutable2016-07-271-1/+1
|/ / / | | | | | | | | | | | | | | | This was missing from gitlab-org/gitlab-ce!5509. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'rs-elixir-ci-typo' into 'master' Grzegorz Bizon2016-07-271-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in Elixir CI template See merge request !5514
| * | | Fix typo in Elixir CI templaters-elixir-ci-typoRobert Speicher2016-07-261-1/+1
| | | | | | | | | | | | | | | | [ci skip]
* | | | Merge branch '20124-disable-repository-validation-during-precompile-step' ↵Stan Hu2016-07-272-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Add ENV variable to skip repository storages validations Closes #20124 See merge request !5478
| * | | | Add ENV variable to skip repository storages validations20124-disable-repository-validation-during-precompile-stepAlejandro Rodríguez2016-07-252-1/+2
| | | | |
* | | | | Merge branch 'fix-missing-schema-update' into 'master' Stan Hu2016-07-261-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Fix missing schema update for 20160722221922 20160722221922 was merged in 8.10.1 but the schema.rb was not updated. See merge request !5512
| * | | | Fix missing schema update for 20160722221922Stan Hu2016-07-261-1/+1
| | | | |
* | | | | Merge branch 'feature/profile-requests-conditionally' into 'master' Douwe Maan2016-07-2615-13/+197
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return request profiling info when a header is passed ## What does this MR do? It allows returning profiling info (instead of actual content) when a certain header is passed ## Why was this MR needed? To facilitate having a performance overview of certain requests. ## What are the relevant issue numbers? https://gitlab.com/gitlab-com/infrastructure/issues/211 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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~~ - [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 !5281
| * | | | Whitelist 'Simplified BSD' licenseDouwe Maan2016-07-261-12/+19
| | | | |
| * | | | Profile requests when a header is passedfeature/profile-requests-conditionallyAhmad Sherif2016-07-2614-1/+178
| | |/ / | |/| |
* | | | Merge branch '20302-forking-a-project-from-one-storage-to-another-fails' ↵Douwe Maan2016-07-267-11/+47
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Fix a bug where forking a project from a repository storage to another would fail ## What does this MR do? Fix a bug where forking a project from a repository storage to another would fail. ## Are there points in the code the reviewer needs to double check? No ## Why was this MR needed? If you have a project in storage_a, change the default storage to storage_b, and attempt to fork said project, the import will fail. ## What are the relevant issue numbers? Closes #20302 - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 - [ ] All builds are passing - [x] 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 you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) - [ ] Merge https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/75, publish the tag, and update `GITLAB_SHELL_VERSION` See merge request !5509
| * | | | Fix a bug where forking a project from a repository storage to another would ↵20302-forking-a-project-from-one-storage-to-another-failsAlejandro Rodríguez2016-07-267-11/+47
| |/ / / | | | | | | | | | | | | fail
* | | | Merge branch 'cs-rm-inline-js-import' into 'master' Fatih Acet2016-07-267-13/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove inline scripts from import pages. ## What does this MR do? Removes inline scripts from the Import Status pages for all the importers we have. ## Are there points in the code the reviewer needs to double check? That this doesn't break anything (it didn't when I tested it!) ## Why was this MR needed? Inline scripts are bad, this removes a few of them. ## What are the relevant issue numbers? #18231 and #19866 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - 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 !5283
| * | | | Remove inline scripts from import pages.cs-rm-inline-js-importConnor Shea2016-07-267-13/+14
| |/ / / | | | | | | | | | | | | Instead add data attributes to a JS hook element on every import status page.
* | | | Merge branch 'sortable-branches-push-permission' into 'master' Fatih Acet2016-07-262-20/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make branches sortable without push permission ## What does this MR do? Make branches on the branches page sortable without push permission. ## Why was this MR needed? Sorting branches (a readonly action) required push permission which does not make sense. ## What are the relevant issue numbers? fixes #18678 ## Screenshots ### Before ![before](/uploads/d77d0be2599481b815cb2ef1f9c33a15/before.png) ### After ![after](/uploads/edbcf9d5ec4b2650866742ead0c2c1ed/after.png) See merge request !5462
| * | | | Make branches sortable without push permission (!5462)winniehell2016-07-262-20/+24
| |/ / /
* | | | Merge branch '18846-fix-graphs-small-legend' into 'master' Fatih Acet2016-07-263-2/+16
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Commits graph has overlapping text on mobile" Apply responsive design for labels on Commits and Continuous Integration graphs. ## What does this MR do? Make the labels on Commits and Continuous Integration graphs smaller for mobile devices. ## Are there points in the code the reviewer needs to double check? Graphs should not break at any screen size. ## Why was this MR needed? Labels overlaps each other on mobile devices. ## What are the relevant issue numbers? Fixes #18846 (but also fixes a similar bug on Continuous Integration graph). ## Screenshots (if relevant) Before: ![Screen_Shot_2016-06-21_at_23.15.29](/uploads/acbbb8d751a2192595a61804d09868d9/Screen_Shot_2016-06-21_at_23.15.29.png) After: ![Screen_Shot_2016-06-21_at_23.04.57](/uploads/ab7607901c3ae07d2c2d3e25e83de901/Screen_Shot_2016-06-21_at_23.04.57.png) ## Does this MR meet the acceptance criteria? - ~~[ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 [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) cc: @jschatz1 See merge request !4841
| * | | Apply responsive design for labels on graphsMauro Verrocchio2016-07-223-2/+16
| | | | | | | | | | | | | | | | | | | | Labels Commits and Continuous Integration graphs now scales if on mobile.
* | | | Merge branch 'cs-upgrade-database-cleaner' into 'master' Robert Speicher2016-07-262-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade database_cleaner from 1.4.1 to 1.5.3. This includes support for Rails 5 without deprecations warnings. Working toward #14286. Changelog: https://github.com/DatabaseCleaner/database_cleaner/blob/master/History.rdoc#153-2016-04-22 See merge request !5505
| * | | | Upgrade database_cleaner from 1.4.1 to 1.5.3.cs-upgrade-database-cleanerConnor Shea2016-07-262-3/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | This includes support for Rails 5 without deprecations warnings. Changelog: https://github.com/DatabaseCleaner/database_cleaner/blob/master/History.rdoc#153-2016-04-22
* | | | Merge branch '20233-confidential-issue' into 'master' Rémy Coutable2016-07-263-1/+23
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show release notes in tag list ## What does this MR do? Two things in one! Ensure that a tag's message having an invalid UTF-8 byte sequence doesn't cause a 500, like at: https://gitlab.com/bitcubate/node/tags?page=9 (The problem tag is https://gitlab.com/bitcubate/node/tags/v0.1.0) Also ensure that the release notes are actually shown on the tag index, like they are supposed to. ## Are there points in the code the reviewer needs to double check? There's not much, so all of it. ## Why was this MR needed? The tags index was broken in two ways. ## What are the relevant issue numbers? Closes #20233 but does more than that. ## Screenshots (if relevant) Before: ![image](/uploads/5456fcc70f02794570762e6ed9c6d863/image.png) After: ![image](/uploads/0329bf93e0f1be2417e500e924bc775d/image.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 - [ ] 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 !5503
| * | | | Show release notes in tag listSean McGivern2016-07-263-1/+23
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | A release's tag reference is just the name of the tag, not the entire tag object. This also fixes the tags index if a tag's message contains non-UTF8 byte sequences.
* | | | Merge branch '20156-rescue-reference-create-due-to-file-lock-exists' into ↵Stan Hu2016-07-262-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Rescue Rugged::OSError (lock exists) when creating references. ## What does this MR do? Rescue an exception on concurrent scenarios. I was able to create a spec for this, because if you create the lock file before trying to create the reference the reference is created without a problem and the lock file is removed. So IMHO there is a race condition where more than one process is trying to create the same reference at the same time raising the exception, so I just added the patch without specs. ```ruby it "attempting to call keep_around when exists a lock does not fail" do ref = repository.send(:keep_around_ref_name, sample_commit.id) path = File.join(repository.path, ref) lock_path = "#{path}.lock" FileUtils.mkdir_p(path) File.open(lock_path, 'w') { |f| f.write('') } begin # No exception is raised because the lock file is removed at some point in the process repository.keep_around(sample_commit.id) ensure File.delete(path) File.delete(lock_path) end end ``` ## Why was this MR needed? ## What are the relevant issue numbers? Closes #20156 ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 - [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 !5497
| * | | | Rescue Rugged::OSError (lock exists) when creating references.20156-rescue-reference-create-due-to-file-lock-existsPaco Guzman2016-07-262-0/+4
| | | | |
* | | | | Merge branch '20139-branch-icon' into 'master' Fatih Acet2016-07-261-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add branch or tag icon to ref in builds page ## What does this MR do? Add branch or tag icon to ref in builds page ## Why was this MR needed? It's currently missing but should be there ## What are the relevant issue numbers? Closes #20139 ## Screenshots (if relevant) <img src="/uploads/fb5c9a285a1ce95c0aa8dfa5e32c5d7d/Screen_Shot_2016-07-22_at_9.14.39_AM.png" width="400px"> See merge request !5434
| * | | | | Add branch or tag icon to ref in builds page20139-branch-iconAnnabel Dunstone2016-07-221-0/+2
| | | | | |
* | | | | | Merge branch '20241-expand-all-button-breaks-diff-comparison-view' into ↵Rémy Coutable2016-07-262-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix expand all diffs button in compare view ## What does this MR do? Fix the expand all diffs button in compare view. ## Are there points in the code the reviewer needs to double check? Don't think so. ## Why was this MR needed? We can't reuse the existing value of the format parameter, because on the merge request page that's 'json', so the link would go to a JSON file. We can't set it to HTML, because that adds '.html' to the URL, which breaks the compare view (and looks bad). Setting it to `nil` uses the default format, which in all of these cases is HTML anyway. ## What are the relevant issue numbers? Closes #20241. See merge request !5500
| * | | | | | Fix expand all diffs button in compare view20241-expand-all-button-breaks-diff-comparison-viewSean McGivern2016-07-262-1/+2
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can't reuse the existing value of the format parameter, because on the merge request page that's 'json', so the link would go to a JSON file. We can't set it to HTML, because that adds '.html' the URL, which breaks the compare view (and looks bad). Setting it to nil uses the default format, which in all of these cases is HTML anyway.
* | | | | | Merge branch 'multiple-trigger-variables-show-in-separate-line' into 'master' Rémy Coutable2016-07-266-6/+29
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multiple trigger variables show in separate line ## What does this MR do? Separate lines for multiple trigger variables ## Screenshot ![Zrzut_ekranu_2016-07-19_o_13.05.01](/uploads/a6f9ec842f65266ae38922b1e9d5ab84/Zrzut_ekranu_2016-07-19_o_13.05.01.png) ## What are the relevant issue numbers? Closes #19006 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] Add tests for multiple trigger variables view - [x] All builds are passing - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) cc @ubudzisz @grzesiek @yorickpeterse @tmaczukin [@chastell](https://github.com/chastell) [@tomash](https://github.com/tomash) See merge request !5357
| * | | | | Update CHANGELOGKatarzyna Kobierska2016-07-261-6/+1
| | | | | |
| * | | | | Fix testsKatarzyna Kobierska2016-07-263-3/+3
| | | | | |
| * | | | | Tests refactoring for trigger variablesKatarzyna Kobierska2016-07-262-8/+12
| | | | | |
| * | | | | Add test for multiple trigger variables viewKatarzyna Kobierska2016-07-261-1/+18
| | | | | |
| * | | | | Multiple trigger variables show in separate lineKatarzyna Kobierska2016-07-262-2/+9
| | |/ / / | |/| | |