summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix review commentsjramsay-4012-improve-internationization-docsJames Ramsay2017-10-063-7/+7
* Docs: add translation and proof reading guidelinesJames Ramsay2017-10-055-1/+138
* 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
|/ / / / / / / /
* | | | | | | | Merge branch 'rc/tag-specs' into 'master'38362-delayed-pr-merge-wait-time-40m-1hRobert Speicher2017-09-251-2/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | Automatically set a :type for specsrc/tag-specsRémy Coutable2017-09-221-2/+10
* | | | | | | | | Merge branch 'docs/chmod-644' into 'master'Rémy Coutable2017-09-2567-2/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Check for exec permissions also in app/docs/chmod-644Achilleas Pipinellis2017-09-2511-3/+2
| * | | | | | | | | Add check for exec permissions and refactor lint doc scriptAchilleas Pipinellis2017-09-251-2/+17
| * | | | | | | | | Change mode to 644 for all md and png filesAchilleas Pipinellis2017-09-2556-0/+0
* | | | | | | | | | Merge branch '38155-autodevops-typo' into 'master'Achilleas Pipinellis2017-09-251-1/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Fix auto devops typos in Pipeline Settings viewMark Fletcher2017-09-221-1/+2
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'sh-fix-email-provider-take2' into 'master'Yorick Peterse2017-09-252-2/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Fix PG::UniqueViolation external_email migrationsh-fix-email-provider-take2Stan Hu2017-09-252-2/+2
* | | | | | | | | Merge branch '34371-cycle-analitcs-global' into 'master'Phil Hughes2017-09-254-59/+54
|\ \ \ \ \ \ \ \ \
View Lorry Controller Status