summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* [skip ci] Replace col-*-offset-* with offset-*-*Clement Ho2018-04-1336-53/+53
* [skip ci] Add pagination stylesClement Ho2018-04-138-23/+21
* [skip ci] add col-sm-* for form-horizontal changes to keep layoutClement Ho2018-04-1230-79/+79
* [skip ci] input-group-btn's input-group-text should not create a new divClement Ho2018-04-1210-75/+52
* [skip ci] Fix alignment for project statsClement Ho2018-04-123-4/+3
* [skip ci] Fix collapse sidebar button stylesClement Ho2018-04-121-0/+9
* [skip ci] Convert btn-xs to btn-smClement Ho2018-04-1228-57/+57
* [skip ci] Remove .page-headerClement Ho2018-04-121-1/+1
* [skip ci] .input-group-btn into .input-group-prepend, .input-group-appendClement Ho2018-04-1214-81/+106
* [skip ci] .input-group-addon to .input-group-prepend, .input-group-appendClement Ho2018-04-1217-40/+65
* [skip ci] .form-horizontal => .form-group.rowClement Ho2018-04-1291-345/+342
* [skip ci] Use toggleClass instead of toggleClement Ho2018-04-1211-17/+17
* Merge branch 'master' into bootstrap4Clement Ho2018-04-12105-688/+543
|\
| * Renamed 'Overview' to 'Project' in the contextual navigation at a project levelConstance Okoghenun2018-04-121-1/+1
| * Merge branch 'dm-archived-read-only' into 'master'Robert Speicher2018-04-1251-198/+283
| |\
| | * Show `New Issue` link for projectsBob Van Landuyt2018-04-116-9/+23
| | * Prevent awarding emoji when a project is archivedBob Van Landuyt2018-04-1113-20/+40
| | * Correct permissions for creating merge requests from issuesBob Van Landuyt2018-04-112-3/+3
| | * Hide file/directory creation buttonsBob Van Landuyt2018-04-117-25/+36
| | * Hide `new merge request` button from index pageBob Van Landuyt2018-04-111-1/+1
| | * Hide new mr from dropdown for archived projectsBob Van Landuyt2018-04-112-1/+13
| | * Share collaboration check between view and presenterBob Van Landuyt2018-04-116-32/+28
| | * Rename `create_merge_request` permissionsBob Van Landuyt2018-04-1111-18/+19
| | * Prevent new merge requests for archived projectsBob Van Landuyt2018-04-116-5/+18
| | * Move `ProjectPolicy`-class methods into moduleBob Van Landuyt2018-04-102-16/+21
| | * Add ability checks in views where they were previously missingDouwe Maan2018-04-108-38/+42
| | * Update policies to make archived projects completely read-onlyDouwe Maan2018-04-104-44/+66
| | * Remove edit_note and update_note abilities in favor of admin_noteDouwe Maan2018-04-106-17/+3
| | * Update phrasing around archived feature in UIDouwe Maan2018-04-103-7/+8
| | * Rename delete_protected_branch ability to push_to_delete_protected_branch to ...Douwe Maan2018-04-102-3/+3
| * | Merge branch 'revert-93869c63' into 'master'Filipa Lacerda2018-04-126-26/+47
| |\ \
| | * | Revert "Merge branch '44870-remove-extra-space-around-comment-form-on-merge-r...Clement Ho2018-04-126-26/+47
| * | | Resolve "Clean up old project permissions frontend code"Mike Greiling2018-04-127-252/+16
| * | | Align action icons in pipeline graphFilipa Lacerda2018-04-121-7/+1
| |/ /
| * | Merge branch 'move-help-state-vue-component' into 'master'Filipa Lacerda2018-04-122-25/+28
| |\ \
| | * | Move TimeTrackingHelpState vue componentGeorge Tsiolis2018-04-112-25/+28
| * | | Merge branch 'winh-dropdown-entry-unlocking' into 'master'Phil Hughes2018-04-121-1/+1
| |\ \ \
| | * | | Remove green background from unlock button in admin areaWinnie Hellmann2018-04-101-1/+1
| * | | | Merge branch 'rendering-markdown-multiple-projects' into 'master'Douwe Maan2018-04-127-18/+21
| |\ \ \ \
| | * | | | Support Markdown rendering using multiple projectsrendering-markdown-multiple-projectsYorick Peterse2018-04-117-18/+21
| | |/ / /
| * | | | Merge branch 'fix/gb/fix-pipeline-statuses-illustrations' into 'master'Marin Jankovski2018-04-121-1/+1
| |\ \ \ \
| | * | | | Show build trace placeholder when build is runningGrzegorz Bizon2018-04-111-1/+1
| * | | | | Merge branch 'mk/geo/backport-broadcast-message-cache-expiration-hook' into '...Nick Thomas2018-04-111-1/+5
| |\ \ \ \ \
| | * | | | | Backport: Propagate broadcast messages to secondariesMichael Kozono2018-04-111-1/+5
| * | | | | | Merge branch 'winh-protection-push-dropdowns-backport' into 'master'Clement Ho2018-04-113-7/+2
| |\ \ \ \ \ \
| | * | | | | | Limit dropdown toggle width for protected branches / tagswinh-protection-push-dropdowns-backportWinnie Hellmann2018-04-053-7/+2
| * | | | | | | Merge branch 'unresolved-discussions-vue-component-i18n-and-tests' into 'master'Clement Ho2018-04-111-4/+8
| |\ \ \ \ \ \ \
| | * | | | | | | Add i18n and update specs for UnresolvedDiscussions vue componentGeorge Tsiolis2018-03-271-4/+8
| * | | | | | | | Merge branch '41748-vertical-misalignment-login-box' into 'master'Clement Ho2018-04-115-22/+6
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Refactor CSS to eliminate vertical misalignment of login navTakuya Noguchi2018-04-115-22/+6