summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add test to add a new project memberml-qa-add-membersMark Lapierre2018-09-218-4/+85
| | | | Adds a new QA test and the required page objects and related changes
* Merge branch 'jr-wiki-doc' into 'master'Achilleas Pipinellis2018-09-201-5/+8
|\ | | | | | | | | Update wiki upload documentation See merge request gitlab-org/gitlab-ce!21815
| * Update wiki upload documentationJames Ramsay2018-09-201-5/+8
|/
* Merge branch 'jr-webhook-docs' into 'master'Achilleas Pipinellis2018-09-202-0/+8
|\ | | | | | | | | Add webhook branch filtering docs See merge request gitlab-org/gitlab-ce!21816
| * Add webhook branch filtering docsJames Ramsay2018-09-202-0/+8
|/
* Merge branch '51657-fix-merge-mr-from-fork-spec' into 'master'Robert Speicher2018-09-202-5/+21
|\ | | | | | | | | | | | | QA: Fix failure in merge_merge_request_from_fork_spec.rb Closes #51657 See merge request gitlab-org/gitlab-ce!21817
| * QA: Fix failure in merge_merge_request_from_fork_spec.rbMark Lapierre2018-09-202-5/+21
|/
* Merge branch 'move-cloud-images-job-stage' into 'master'Robert Speicher2018-09-201-1/+1
|\ | | | | | | | | Move the cloud-native-image trigger job into the test stage See merge request gitlab-org/gitlab-ce!21819
| * Move the cloud-native-image trigger job into the test stageDJ Mountney2018-09-191-1/+1
| | | | | | | | | | | | | | | | | | | | This is because the CNG pipeline now relies on the assets compiled here in the gitlab:assets:compile job (It waits up to 30 minutes for them) Without this change, the cloud native job was holding up the pipeline, preventing the assets compile job from being run.
* | Merge branch '51549-runners-table' into 'master'Annabel Dunstone Gray2018-09-205-50/+77
|\ \ | | | | | | | | | | | | | | | | | | Fixes Admin Runners table not wrapping the content Closes #51549 See merge request gitlab-org/gitlab-ce!21802
| * | Wrap content for admin runners tableFilipa Lacerda2018-09-205-50/+77
| | | | | | | | | | | | | | | | | | | | | While refactoring the table into a responsive one we did not account for wrapping issues. This commit wraps some cells and truncates others. Adds `section-5` class to the responsive tables CSS
* | | Merge branch '44998-split-admin-settings-into-multiple-sub-pages' into 'master'Dmitriy Zaporozhets2018-09-2021-537/+704
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Split admin settings into multiple sub pages" Closes #44998 See merge request gitlab-org/gitlab-ce!21467
| * | | Utilize expanded_by_defaultMartin Wortschack2018-09-199-75/+71
| | | |
| * | | Add empty controller actions and utilize referer_path helperMartin Wortschack2018-09-192-2/+30
| | | |
| * | | Groups test cases by contextMartin Wortschack2018-09-181-278/+266
| | | |
| * | | Parse request.referer properlyMartin Wortschack2018-09-181-1/+1
| | | |
| * | | Rename helper methodMartin Wortschack2018-09-182-4/+4
| | | |
| * | | Adds translationsMartin Wortschack2018-09-188-16/+16
| | | |
| * | | Adds 'Snowplow' section to IntegrationsMartin Wortschack2018-09-141-0/+2
| | | |
| * | | 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"
View Lorry Controller Status