summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Fix merge request header marginsleipert-fix-mr-widget-header-marginsLukas Eipert2018-09-251-25/+35
* Merge branch 'upgrade-eslint' into 'master'Marin Jankovski2018-09-2455-99/+101
|\
| * Switch to per-line rule exceptionsupgrade-eslintMike Greiling2018-09-211-2/+4
| * Resolve eslint-plugin-vue errorsMike Greiling2018-09-2053-96/+95
| * Upgrade eslint to v5Mike Greiling2018-09-202-3/+4
* | Merge branch 'dm-create-note-return-discussion' into 'master'Filipa Lacerda2018-09-246-66/+75
|\ \
| * | Changed `true` string to a booleanPhil Hughes2018-09-211-1/+1
| * | Fixed karma spec for getNoteFormDataPhil Hughes2018-09-211-2/+2
| * | Use returned discussion from APIPhil Hughes2018-09-214-53/+39
| * | Return discussion object from NotesController#create when return_discussion p...Douwe Maan2018-09-212-13/+36
* | | Merge branch 'fix/help-text-font-color-in-merge-request-creation' into 'master'Filipa Lacerda2018-09-241-1/+1
|\ \ \
| * | | Removed span tag and p tag from form-textGerard Montemayor2018-09-221-3/+3
| * | | Change .js-wip-explanation div element to spanGerard Montemayor2018-09-131-2/+2
* | | | Merge branch 'ee-admin-geo-namespace-support' into 'master'Douglas Barbosa Alexandre2018-09-211-3/+3
|\ \ \ \
| * | | | Backport Admin menu changes from EEGabriel Mazetto2018-09-211-3/+3
* | | | | Merge branch '51725-push-mirrors-default-branch-reset-to-master' into 'master'Stan Hu2018-09-213-8/+0
|\ \ \ \ \
| * | | | | Doesn't synchronize default branch for push mirrorsDouglas Barbosa Alexandre2018-09-213-8/+0
* | | | | | Align form labels following Bootstrap 4 docsAnnabel Dunstone Gray2018-09-216-10/+9
* | | | | | Allows to sort projects by most stars🙈 jacopo beschi 🙉2018-09-212-2/+13
|/ / / / /
* | | | | Merge branch 'dz-issue-css-classes' into 'master'Annabel Dunstone Gray2018-09-217-20/+20
|\ \ \ \ \
| * | | | | Rename some css classes that are shared between issues and mrsDmitriy Zaporozhets2018-09-217-20/+20
| | |_|/ / | |/| | |
* | | | | Correct Gitlab Capitalization in code filesMarcel Amirault2018-09-215-8/+8
* | | | | Merge branch '47398-user-is-unable-revoke-a-authorized-application-unless-use...Dmitriy Zaporozhets2018-09-213-13/+15
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add message about disabled oauth feature in user profileDmitriy Zaporozhets2018-09-211-0/+3
| * | | | Always allow user to revoke an authorized applicationDmitriy Zaporozhets2018-09-202-13/+12
* | | | | 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