summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | Moves 'External Authorization' before 'Web terminal'Martin Wortschack2018-09-141-0/+2
| | | | | | |
| * | | | | | Removes duplicated sectionsMartin Wortschack2018-09-142-22/+0
| | | | | | |
| * | | | | | Adds empty methods for 'geo' and 'templates'Martin Wortschack2018-09-141-0/+6
| | | | | | |
| * | | | | | Removes divider in flyout menuMartin Wortschack2018-09-131-9/+1
| | | | | | |
| * | | | | | remove 'Geo' and 'Templates' template from CE and display menu items for EE onlyMartin Wortschack2018-09-114-25/+21
| | | | | | |
| * | | | | | load usage ping script on admin settings subpage onlyMartin Wortschack2018-09-112-5/+8
| | | | | | |
| * | | | | | merge master and resolve conflictsMartin Wortschack2018-09-11765-6663/+11476
| |\ \ \ \ \ \
| * | | | | | | use referer for redirect instead of hidden field param from partialsMartin Wortschack2018-09-1031-61/+1
| | | | | | | |
| * | | | | | | fix test for usage statisticsMartin Wortschack2018-09-071-0/+2
| | | | | | | |
| * | | | | | | fix broken pathMartin Wortschack2018-09-071-1/+1
| | | | | | | |
| * | | | | | | merge master and resolve conflictsMartin Wortschack2018-09-06543-4985/+97825
| |\ \ \ \ \ \ \
| * | | | | | | | add breadcrumb and page title for sub pages on admin settingsMartin Wortschack2018-09-069-18/+18
| | | | | | | | |
| * | | | | | | | handle redirect properlyMartin Wortschack2018-09-061-1/+3
| | | | | | | | |
| * | | | | | | | add 'redirect_path' parameter to formsMartin Wortschack2018-09-0630-0/+60
| | | | | | | | |
| * | | | | | | | remove trailing whitespacesMartin Wortschack2018-09-053-3/+1
| | | | | | | | |
| * | | | | | | | fix testsMartin Wortschack2018-09-051-1/+1
| | | | | | | | |
| * | | | | | | | fix qa selectorMartin Wortschack2018-09-053-4/+5
| | | | | | | | |
| * | | | | | | | fix testsMartin Wortschack2018-09-051-2/+47
| | | | | | | | |
| * | | | | | | | redirect to the relevant sub page after updating application settingsMartin Wortschack2018-09-051-1/+1
| | | | | | | | |
| * | | | | | | | update PO fileMartin Wortschack2018-09-051-0/+15
| | | | | | | | |
| * | | | | | | | adds 'Geo' sub page to application settingsMartin Wortschack2018-09-053-1/+12
| | | | | | | | |
| * | | | | | | | split application settings into multiple sub pagesMartin Wortschack2018-09-0412-251/+361
| | | | | | | | |
* | | | | | | | | Merge branch 'mr-discussion-expanding-bug-fixes' into 'master'Filipa Lacerda2018-09-202-1/+39
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Fixed hidden truncated diff lines not showing when expanded See merge request gitlab-org/gitlab-ce!21801
| * | | | | | | | Added test for adding `truncated_diff_lines` to discussionPhil Hughes2018-09-201-0/+35
| | | | | | | | |
| * | | | | | | | Fixed hidden truncated diff lines not showing when expandedPhil Hughes2018-09-181-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `truncated_diff_lines` gets added to collapsed discussions when expanded at this point `truncated_diff_lines` doesn't exist and is therefore not reactive. This property gets added when creating discussions in order for it to start as a reactive property
* | | | | | | | | Merge branch '44768-lazy-load-xterm-css' into 'master'Phil Hughes2018-09-204-0/+11
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lazy load xterm css custom colors file Closes #44768 See merge request gitlab-org/gitlab-ce!21804
| * | | | | | | | | Lazy load xterm css colorsFilipa Lacerda2018-09-194-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manually includes the xterm custom colors on the 3 files that will need it: job log page, job terminal page, environment terminal page Reduces main CSS bundle
* | | | | | | | | | Merge branch '51201-document-review-apps-docs' into 'master'Marin Jankovski2018-09-202-0/+88
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document Review Apps Closes #51201 See merge request gitlab-org/gitlab-ce!21574
| * | | | | | | | | | Document review apps setup for gitlab-{ce,ee}Rémy Coutable2018-09-172-0/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> Signed-off-by: ddavison <ddavison@gitlab.com>
* | | | | | | | | | | Merge branch '50347-fix-scrolling-to-diff-note-after-incremental-rendering' ↵Phil Hughes2018-09-205-40/+215
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Link to file in Changes tab of MR no longer works for all files after incremental rendering improvement" Closes #50347 See merge request gitlab-org/gitlab-ce!21727
| * | | | | | | | | | Resolve "Link to file in Changes tab of MR no longer works for all files ↵André Luís2018-09-205-40/+215
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after incremental rendering improvement"
* | | | | | | | | | Merge branch 'docs-dev-guidelines-milestones' into 'master'Achilleas Pipinellis2018-09-201-0/+16
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explain the docs' CD, relating to the milestone the doc is set to vs online docs See merge request gitlab-org/gitlab-ce!21737
| * | | | | | | | | | Explain the docs' CD, relating to the milestone the doc is set to vs online docsMarcia Ramos2018-09-201-0/+16
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'docs/rs-update-docs' into 'master'Achilleas Pipinellis2018-09-202-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct Gitaly config typo in update guides See merge request gitlab-org/gitlab-ce!21821
| * | | | | | | | | | Correct Gitaly config typo in update guidesRobert Speicher2018-09-192-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 9.4 to 9.5 and 9.5 to 10.0 guides missed a closing backtick. This was corrected in the 10.0 to 10.1 guide, from which subsequent guides were written without the error.
* | | | | | | | | | | Merge branch 'docs/fix-releases-link' into 'master'Achilleas Pipinellis2018-09-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix link to blog posts in docs See merge request gitlab-org/gitlab-ce!21820
| * | | | | | | | | | Fix link to blog postsEvan Read2018-09-201-1/+1
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to a missing `s`, a link to the blog archive for releases was broken.
* | | | | | | | | | Merge branch 'sh-delete-tags-outside-transaction' into 'master'Robert Speicher2018-09-196-7/+24
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delete container repository tags outside of transaction Closes #51380 See merge request gitlab-org/gitlab-ce!21679
| * | | | | | | | | Move registry destroy out of project transactionStan Hu2018-09-195-9/+18
| | | | | | | | | |
| * | | | | | | | | Delete container repository tags outside of transactionStan Hu2018-09-194-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When there are many tags in a container repository, deleting them can exceed the default 60 second idle-in-transaction timeout in Sidekiq. We now explicitly delete them in the DestroyService before destroying the model. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51380
* | | | | | | | | | Merge branch 'fix-rubocop-todo' into 'master'Douglas Barbosa Alexandre2018-09-197-21/+7
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix rubocop Style/ZeroLengthPredicate See merge request gitlab-org/gitlab-ce!21793
| * | | | | | | | | | Fix rubocop Style/ZeroLengthPredicateSemyon Pupkov2018-09-187-21/+7
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'relax-danger-commit-subject-rules' into 'master'Robert Speicher2018-09-191-2/+14
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relax the subject line requirements for commits Closes gitlab-org/release/framework#16 See merge request gitlab-org/gitlab-ce!21811
| * | | | | | | | | | | Relax the subject line requirements for commitsYorick Peterse2018-09-191-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the hard limit of 50 to a soft limit of 50, with the new hard limit being 72 characters. This gives people a bit more space, while still (hopefully) guiding them towards subject lines that are roughly 50 characters long. Fixes https://gitlab.com/gitlab-org/release/framework/issues/16
* | | | | | | | | | | | Merge branch 'mr-legacy-diff-notes' into 'master'Filipa Lacerda2018-09-1911-25/+239
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-enable legacy diff notes on merge request diffs Closes #48873 See merge request gitlab-org/gitlab-ce!21652
| * | | | | | | | | | | | Changed isDiscussionApplicableToLine to accept an objectPhil Hughes2018-09-183-16/+28
| | | | | | | | | | | | |
| * | | | | | | | | | | | Added specs to isDiscussionApplicableToLinePhil Hughes2018-09-171-10/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It now tests for the latest diff check
| * | | | | | | | | | | | Updated latestDiff logic to only be used to LegacyDiffNotesPhil Hughes2018-09-172-5/+3
| | | | | | | | | | | | |
| * | | | | | | | | | | | Updated LegacyDiffNote logicPhil Hughes2018-09-175-11/+30
| | | | | | | | | | | | |
| * | | | | | | | | | | | Moved legacy diff note check into util methodPhil Hughes2018-09-173-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Un-commented out expect checks in mutation spec