summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove `weight` from IssuableFinder::SCALAR_PARAMS and improve the array form...rc/backport-ce-to-ee-changesRémy Coutable2017-09-261-1/+19
* Backport part of c777bb91fd7 and 4074cb3b7c16 from EERémy Coutable2017-09-262-1/+5
* Backport doc change from latest upstream mergeRémy Coutable2017-09-261-11/+11
* Merge branch 'dm-bitbucket-import-truncated-shas' into 'master'Robert Speicher2017-09-267-16/+136
|\
| * Add specsdm-bitbucket-import-truncated-shasDouwe Maan2017-09-252-0/+93
| * Remove unnecessary commentsDouwe Maan2017-09-252-4/+2
| * Add changelogDouwe Maan2017-09-251-0/+6
| * Properly compare diff refs and diff positions when shas are truncatedDouwe Maan2017-09-253-13/+31
| * Expand truncated Bitbucket pull request source/target SHA if possibleDouwe Maan2017-09-251-2/+7
* | Merge branch 'expose-last-pipeline-for-a-commit' into 'master'Rémy Coutable2017-09-266-2/+42
|\ \
| * | Expose last pipeline details in API response when getting a single commitMehdi Lahmam2017-09-266-2/+42
* | | Merge branch 'remove-temporary-ci-index' into 'master'Yorick Peterse2017-09-263-1/+32
|\ \ \
| * | | Remove an unneeded index on ci_builds left in some databasesremove-temporary-ci-indexGreg Stark2017-09-263-1/+32
* | | | Merge branch 'ueberbit/gitlab-ce-omniauth-azure-oauth2' into 'master'Douwe Maan2017-09-263-6/+9
|\ \ \ \
| * | | | Update omniauth-azure-oauth2 to 0.0.9 (Support Office 365 Germany)ueberbit/gitlab-ce-omniauth-azure-oauth2Florian Weber2017-09-263-6/+9
* | | | | Merge branch 'changes-bar-dynamic-placeholder' into 'master'Filipa Lacerda2017-09-264-40/+83
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | remove the sticky el from the test DOM after each testchanges-bar-dynamic-placeholderPhil Hughes2017-09-251-2/+6
| * | | | refactor tests to actually test browser behaviourPhil Hughes2017-09-252-49/+38
| * | | | removed commented out CSSPhil Hughes2017-09-252-6/+1
| * | | | spec fixesPhil Hughes2017-09-221-0/+6
| * | | | fixed and added specs for removing placeholder elementPhil Hughes2017-09-221-3/+37
| * | | | Dynamically create offset for sticky barPhil Hughes2017-09-222-12/+27
* | | | | Merge branch '34371-cycle-analitcs-components-vue' into 'master'Phil Hughes2017-09-2619-433/+400
|\ \ \ \ \
| * | | | | Moves cycle analytics components into vue filesFilipa Lacerda2017-09-2619-433/+400
|/ / / / /
* | | | | Merge branch '38374-add-note-for-upgrading-helm-chart-prior-to-1-3-5-docs' in...Achilleas Pipinellis2017-09-261-1/+16
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add note for upgrading Helm chart prior to 1.3.5 - docsJoshua Lambert2017-09-261-1/+16
|/ / / /
* | | | Merge branch 'remove-old-nav-styles' into 'master'Phil Hughes2017-09-26102-545/+86
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix UI bugsremove-old-nav-stylesAnnabel Dunstone Gray2017-09-253-12/+15
| * | | Fix specsAnnabel Dunstone Gray2017-09-256-6/+4
| * | | Remove all old sub nav barsAnnabel Dunstone Gray2017-09-2574-324/+5
| * | | Combine all search releated CSSAnnabel Dunstone Gray2017-09-252-110/+47
| * | | Remove unused admin subnavsAnnabel Dunstone Gray2017-09-2517-110/+36
| * | | Move new nav into main CSS folderAnnabel Dunstone Gray2017-09-255-6/+2
* | | | Merge branch 'winh-user-dropdown-nowrap' into 'master'Phil Hughes2017-09-261-0/+8
|\ \ \ \
| * | | | Avoid wrapping users in dropdownwinh-user-dropdown-nowrapWinnie Hellmann2017-09-211-0/+8
* | | | | Merge branch 'document-background-migration-stealing' into 'master'Yorick Peterse2017-09-261-1/+28
|\ \ \ \ \
| * | | | | Document manual cleanup after background migration stealingdocument-background-migration-stealingSean McGivern2017-09-251-1/+28
* | | | | | Merge branch 'fix-locked-shared-runners-problem' into 'master'Kamil Trzciński2017-09-263-52/+24
|\ \ \ \ \ \
| * | | | | | Add CHANGELOG entryfix-locked-shared-runners-problemTomasz Maczukin2017-09-251-0/+5
| * | | | | | Fix locked shared runners problemTomasz Maczukin2017-09-252-52/+19
* | | | | | | Merge branch 'patch-2' into 'master'Douwe Maan2017-09-261-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Update gitlab-shell to 5.9.2Jonathon Reinhart2017-09-221-1/+1
* | | | | | | | Merge branch 'rs-remove-dead-markdown-pipeline' into 'master'Douwe Maan2017-09-261-32/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove dead `Gitlab::Markdown::Pipeline` classrs-remove-dead-markdown-pipelineRobert Speicher2017-09-251-32/+0
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch '31094-define-color-priorities' into 'master'Annabel Dunstone Gray2017-09-2612-58/+58
|\ \ \ \ \ \ \ \
| * | | | | | | | Update light colors, remove ’25’ and add ‘950’ shades31094-define-color-prioritiesPedro Moreira da Silva2017-09-2312-58/+58
* | | | | | | | | Merge branch 'acet-repo-editor-fix-reopening-existing-file' into 'master'Jacob Schatz2017-09-251-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | RepoEditor: Fix reopening the existing file on refresh.acet-repo-editor-fix-reopening-existing-fileFatih Acet2017-09-221-1/+1
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch '37912-fix-dash-in-note-access-role' into 'master'Rémy Coutable2017-09-252-1/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix a dash being rendered in the note's access roleMicael Bergeron2017-09-252-1/+7
|/ / / / / / / / /