summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-chat-notification-service-for-ee' into 'master'Dmitriy Zaporozhets2018-09-211-1/+1
|\
| * Fix activity titles for MRs in chat notification servicesNick Thomas2018-09-201-1/+1
* | Merge branch '41040-long-webhook-url-problem' into 'master'Phil Hughes2018-09-211-0/+1
|\ \
| * | Fix long webhook URL overflow for custom integrationKukovskii Vladimir2018-09-111-0/+1
* | | Merge branch 'frozen-string-app-controller' into 'master'Stan Hu2018-09-20104-9/+216
|\ \ \
| * | | Enable frozen string in app/controllers/**/*.rbrepo-forks/gitlab-ce-frozen-string-app-controllergfyoung2018-09-18104-9/+216
* | | | QA: Fix failure in merge_merge_request_from_fork_spec.rbMark Lapierre2018-09-201-3/+3
* | | | Merge branch '51549-runners-table' into 'master'Annabel Dunstone Gray2018-09-204-50/+72
|\ \ \ \
| * | | | Wrap content for admin runners tableFilipa Lacerda2018-09-204-50/+72
* | | | | Merge branch '44998-split-admin-settings-into-multiple-sub-pages' into 'master'Dmitriy Zaporozhets2018-09-2015-295/+406
|\ \ \ \ \
| * | | | | Utilize expanded_by_defaultMartin Wortschack2018-09-199-75/+71
| * | | | | Add empty controller actions and utilize referer_path helperMartin Wortschack2018-09-192-2/+30
| * | | | | 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-11318-1409/+3411
| |\ \ \ \ \
| * | | | | | use referer for redirect instead of hidden field param from partialsMartin Wortschack2018-09-1031-61/+1
| * | | | | | fix broken pathMartin Wortschack2018-09-071-1/+1
| * | | | | | merge master and resolve conflictsMartin Wortschack2018-09-06178-757/+1799
| |\ \ \ \ \ \
| * | | | | | | 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-051-1/+0
| * | | | | | | fix qa selectorMartin Wortschack2018-09-052-2/+2
| * | | | | | | redirect to the relevant sub page after updating application settingsMartin Wortschack2018-09-051-1/+1
| * | | | | | | adds 'Geo' sub page to application settingsMartin Wortschack2018-09-052-0/+11
| * | | | | | | split application settings into multiple sub pagesMartin Wortschack2018-09-0410-251/+355
* | | | | | | | Merge branch 'mr-discussion-expanding-bug-fixes' into 'master'Filipa Lacerda2018-09-201-1/+4
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Fixed hidden truncated diff lines not showing when expandedPhil Hughes2018-09-181-1/+4
* | | | | | | | Merge branch '44768-lazy-load-xterm-css' into 'master'Phil Hughes2018-09-202-0/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Lazy load xterm css colorsFilipa Lacerda2018-09-192-0/+5
* | | | | | | | | Resolve "Link to file in Changes tab of MR no longer works for all files afte...André Luís2018-09-204-23/+76
| |_|_|_|_|/ / / |/| | | | | | |
* | | | | | | | Merge branch 'sh-delete-tags-outside-transaction' into 'master'Robert Speicher2018-09-193-6/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | Move registry destroy out of project transactionStan Hu2018-09-192-6/+15
| * | | | | | | | Delete container repository tags outside of transactionStan Hu2018-09-191-0/+2
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'fix-rubocop-todo' into 'master'Douglas Barbosa Alexandre2018-09-195-6/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix rubocop Style/ZeroLengthPredicateSemyon Pupkov2018-09-185-6/+6
* | | | | | | | | Merge branch 'mr-legacy-diff-notes' into 'master'Filipa Lacerda2018-09-196-14/+36
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Changed isDiscussionApplicableToLine to accept an objectPhil Hughes2018-09-182-2/+6
| * | | | | | | | | Updated latestDiff logic to only be used to LegacyDiffNotesPhil Hughes2018-09-172-5/+3
| * | | | | | | | | Updated LegacyDiffNote logicPhil Hughes2018-09-173-7/+8
| * | | | | | | | | Moved legacy diff note check into util methodPhil Hughes2018-09-172-7/+4
| * | | | | | | | | Re-enable legacy diff notes on merge request diffsPhil Hughes2018-09-176-11/+33
View Lorry Controller Status