summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update the gitlab-shell version in the tmp/tests directory to the right versionupdate-gitlab-shell-in-testsStan Hu2016-08-031-2/+8
* Merge branch '18866-add-simple-identifier-to-public-ssh-keys' into 'master' Douwe Maan2016-08-024-5/+8
|\
| * Tidy the key spec and fix failing user specKeith Pope2016-08-022-2/+2
| * Add simple identifier to public SSH keysKeith Pope2016-08-023-4/+7
* | Merge branch 'rs-external-issue-tracker-redirect' into 'master' Douwe Maan2016-08-027-148/+65
|\ \
| * | Remove `url_for_new_issue` helperrs-external-issue-tracker-redirectRobert Speicher2016-08-015-66/+24
| * | Redirect to external issue tracker from `/issues`Robert Speicher2016-08-016-86/+45
* | | Merge branch 'convert-switch-icon-to-font' into 'master' Dmitriy Zaporozhets2016-08-024-3/+2
|\ \ \
| * | | Convert switch icon into icon fontClement Ho2016-08-014-3/+2
* | | | Merge branch 'job/update-workflow-links' into 'master' Stan Hu2016-08-022-0/+4
|\ \ \ \
| * | | | link the engineering workflow document from process and contributingjob/update-workflow-linksJob van der Voort2016-08-022-0/+4
* | | | | Merge branch 'branches-ending-with-json' into 'master' Douwe Maan2016-08-027-10/+60
|\ \ \ \ \
| * | | | | Allow branch names ending with .json for graph and network page (!5579)winniehell2016-08-023-8/+13
| * | | | | Append .json onto graph request URL (!5136)Phil Hughes2016-08-021-1/+1
| * | | | | Add failing test for #20462winniehell2016-08-024-2/+47
* | | | | | Merge branch 'expand-commit-message-view' into 'master' Fatih Acet2016-08-025-7/+35
|\ \ \ \ \ \
| * | | | | | Expand commit message width in repo viewClement Ho2016-08-025-7/+35
* | | | | | | Merge branch 'update-templates-for-8-11' into 'master' Robert Speicher2016-08-0214-4/+140
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add and update templates for 8.11Ruben Davila2016-08-0214-4/+140
* | | | | | | Merge branch 'ff-artifacts-date-fix' into 'master' Fatih Acet2016-08-021-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fixed artifacts expire date in FFff-artifacts-date-fixPhil Hughes2016-07-271-1/+1
* | | | | | | | Merge branch '14202-speed-up-diff-note-active' into 'master' Yorick Peterse2016-08-029-5/+67
|\ \ \ \ \ \ \ \
| * | | | | | | | Speedup DiffNote#active? on discussions, preloading noteables and avoid touch...Paco Guzman2016-08-029-5/+67
* | | | | | | | | Merge branch 'es6-specs-pls' into 'master' Fatih Acet2016-08-021-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Removed coffee matcherses6-specs-plsLuke Bennett2016-07-291-1/+1
| * | | | | | | | | Added es6 regex to teaspoon matchers, still doesnt fix it, problem with sproc...Luke Bennett2016-07-291-1/+1
* | | | | | | | | | Merge branch '20101-ci-configuration' into 'master' Fatih Acet2016-08-023-0/+9
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Link configuration button to .gitlab-ci.yml20101-ci-configurationAnnabel Dunstone2016-07-282-1/+5
| * | | | | | | | | Add CI configuration button on project pageAnnabel Dunstone2016-07-282-0/+5
* | | | | | | | | | Merge branch 'update_guides' into 'master' Rémy Coutable2016-08-021-28/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove outdated notes from the update guideValery Sizov2016-08-021-28/+4
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'patch-3' into 'master' Achilleas Pipinellis2016-08-021-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fix runner install linkBen Bodenmiller2016-08-021-1/+1
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'remove-unused-js-libraries' into 'master' Dmitriy Zaporozhets2016-08-022-281/+0
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Revert "md5 and utf_encode js libraries"winniehell2016-08-022-281/+0
| |/ / / / / / / /
* | | | | | | | | Merge branch 'instrument-repository-class' into 'master' Rémy Coutable2016-08-022-0/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Instrument the Repository classinstrument-repository-classYorick Peterse2016-08-022-0/+2
* | | | | | | | | | Merge branch '16568-document-wiki-linking-behavior' into 'master' Achilleas Pipinellis2016-08-025-10/+97
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Change Markdown document locationAchilleas Pipinellis2016-08-025-8/+8
| * | | | | | | | | Merge wiki-specific Markdown in main Markdown fileAchilleas Pipinellis2016-08-022-89/+80
| * | | | | | | | | Refactor wiki Markdown documentationAchilleas Pipinellis2016-08-021-25/+35
| * | | | | | | | | Remove the `non-file` qualifier for root links.Timothy Andrew2016-08-021-1/+1
| * | | | | | | | | Use `succeed` to add periods to help text.Timothy Andrew2016-08-021-5/+8
| * | | | | | | | | Add help document describing wiki linking behavior.Timothy Andrew2016-08-023-0/+83
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'fix-downtime-check-compare-with-branch' into 'master' Yorick Peterse2016-08-021-20/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Always compare with FETCH_HEAD in downtime_checkYorick Peterse2016-08-021-20/+6
| |/ / / / / / / /
* | | | | | | | | Merge branch 'fix/import-export-note-attachments' into 'master' Rémy Coutable2016-08-021-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix TODO comment [ci skip]James Lopez2016-08-021-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'handle-disabled-request-store' into 'master' Yorick Peterse2016-08-022-42/+68
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Only use RequestStore in ProjectTeam#max_member_access_for_user if it is activeStan Hu2016-08-012-42/+68