summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove .filesgl-publish-scssClement Ho2018-06-1528-2917/+0
* Create gl-publish-scss branchClement Ho2018-06-1514011-1121588/+3
* Merge branch '47272-applications-table' into 'master'Clement Ho2018-06-151-0/+1
|\
| * Fix odd numbered row bg color in striped table47272-applications-tableAnnabel Dunstone Gray2018-06-151-0/+1
* | Merge branch 'ide-commit-actions-update' into 'master'Filipa Lacerda2018-06-1511-96/+133
|\ \
| * | fixed discard dropdown being off the screenPhil Hughes2018-06-151-1/+2
| * | added computed prop for file list lengthide-commit-actions-updatePhil Hughes2018-06-151-5/+8
| * | fixed tooltip boundaryPhil Hughes2018-06-143-0/+8
| * | alignment updatesPhil Hughes2018-06-144-6/+11
| * | fixed eslintPhil Hughes2018-06-141-5/+5
| * | fixed ellipsis not showing correctlyPhil Hughes2018-06-141-1/+1
| * | fixed karma specPhil Hughes2018-06-141-2/+2
| * | fixed sidebar list specPhil Hughes2018-06-141-1/+1
| * | fixed hover styling caused by dropdownPhil Hughes2018-06-147-41/+47
| * | Improve commit flow in Web IDEPhil Hughes2018-06-145-50/+64
* | | Merge branch 'ce-6145-extract-app-views-shared-issuable-2' into 'master'Robert Speicher2018-06-151-0/+2
|\ \ \
| * | | Explicitly set `selected`ce-6145-extract-app-views-shared-issuable-2Lin Jen-Shin2018-06-141-0/+2
* | | | Merge branch 'dm-remove-favicon-main-version' into 'master'Robert Speicher2018-06-157-63/+6
|\ \ \ \
| * | | | Remove FaviconUploader favicon_main versiondm-remove-favicon-main-versionDouwe Maan2018-06-157-63/+6
* | | | | Merge branch '44771-prettier-seems-to-ignore-the-overrides-2' into 'master'Filipa Lacerda2018-06-154-38/+49
|\ \ \ \ \
| * | | | | Fixed the searching on the whole disk :-P44771-prettier-seems-to-ignore-the-overrides-2Tim Zallmann2018-06-151-3/+6
| * | | | | Added possibility to run prettier against one specific directory to make our ...Tim Zallmann2018-06-152-3/+23
| * | | | | Fixed Prettier Config Applying + Updated Prettier to newest versionTim Zallmann2018-06-153-36/+24
* | | | | | Merge branch 'enable-no-restricted-globals' into 'master'Phil Hughes2018-06-1542-53/+55
|\ \ \ \ \ \
| * | | | | | Enable no-restricted-globals in JS filesgfyoung2018-06-1542-53/+55
|/ / / / / /
* | | | | | Merge branch 'ce-6145-extract-app-views-shared-issuable-3' into 'master'Robert Speicher2018-06-152-2/+5
|\ \ \ \ \ \
| * | | | | | Unify app/views/shared/issuable/form/_metadata.html.hamlce-6145-extract-app-views-shared-issuable-3Lin Jen-Shin2018-06-141-1/+4
| * | | | | | Unify app/views/shared/issuable/_sidebar_assignees.html.hamlLin Jen-Shin2018-06-141-1/+1
* | | | | | | Merge branch '47915-badges' into 'master'Clement Ho2018-06-153-4/+4
|\ \ \ \ \ \ \
| * | | | | | | Fix specsClement Ho2018-06-151-2/+2
| * | | | | | | Truncate long label names47915-badgesAnnabel Dunstone Gray2018-06-142-2/+2
* | | | | | | | Merge branch 'blackst0ne-rails5-fix-optimistic-lock-values' into 'master'Yorick Peterse2018-06-152-52/+64
|\ \ \ \ \ \ \ \
| * | | | | | | | [Rails5] Fix optimistic lock valueblackst0ne2018-06-152-52/+64
* | | | | | | | | Merge branch 'fix-flakey-move-slash-command-unauthorized-project' into 'master'Robert Speicher2018-06-151-1/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix flakey move slash command with unauthorized projectfix-flakey-move-slash-command-unauthorized-projectEric Eastwood2018-06-141-1/+3
* | | | | | | | | | Merge branch 'fix_google_oauth_docs' into 'master'Achilleas Pipinellis2018-06-151-1/+6
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Update google.md to reflect need for Google+ API for oauth integration;Tom Downes2018-05-021-1/+6
* | | | | | | | | | Merge branch 'rails5-fix-47836' into 'master'Yorick Peterse2018-06-153-3/+9
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Rails5 fix passing Group objects array into for_projects_and_groups milestone...Jasper Maes2018-06-143-3/+9
* | | | | | | | | | | Merge branch 'bvl-graphql-nested-merge-request' into 'master'Douwe Maan2018-06-1512-108/+107
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Allow querying a single MR within a projectBob Van Landuyt2018-06-1512-108/+107
| * | | | | | | | | | | Correct the type of the `MergeRequestResolver`.Bob Van Landuyt2018-06-141-1/+1
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'adding-package-lock-ignore' into 'master'Phil Hughes2018-06-151-0/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update .gitignore with ignoring package-lock.jsonDimitrie Hoekstra2018-06-151-0/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'fix-rails5-nagative-enum-spec' into 'master'Kamil TrzciƄski2018-06-151-8/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Remove unexpected data store test suitefix-rails5-nagative-enum-specShinya Maeda2018-06-151-8/+0
| * | | | | | | | | | | Fix "[Rails5] '-1' is not a valid data_store"Shinya Maeda2018-06-151-1/+1
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'ide-add-last-commit-id-to-api-call' into 'master'Douwe Maan2018-06-156-117/+107
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | only return last_commit_sha in the JSONide-add-last-commit-id-to-api-callPhil Hughes2018-06-155-13/+8
| * | | | | | | | | | | IDE sends last commit ID when committing changesPhil Hughes2018-06-156-117/+112
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |