summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Simplify check for running job on Redis39032-improve-merge-ongoing-check-consistencyOswaldo Ferreira2017-10-134-3/+22
* Make "merge ongoing" check more consistentOswaldo Ferreira2017-10-113-2/+27
* Merge branch 'ph-gl-form-js-modules' into 'master'Filipa Lacerda2017-10-1110-232/+214
|\
| * spec fixesph-gl-form-js-modulesPhil Hughes2017-10-114-24/+15
| * Moves form related JS modules out of globalPhil Hughes2017-10-118-210/+201
* | Merge branch 'backport-ee-change-for-test' into 'master'Rémy Coutable2017-10-112-6/+2
|\ \
| * | Backport EE change for setting up forked projectbackport-ee-change-for-testLin Jen-Shin2017-10-112-6/+2
* | | Merge branch 'fix/pass-git-object-dir-attrs-as-relative' into 'master'Douwe Maan2017-10-117-30/+70
|\ \ \
| * | | Pass git object dir attributes as relative paths to GitalyAhmad Sherif2017-10-117-30/+70
* | | | Merge branch 'winh-i18n-inclusive-language-docs' into 'master'Achilleas Pipinellis2017-10-111-0/+12
|\ \ \ \
| * | | | Add inclusive language to translation guidelineswinh-i18n-inclusive-languageWinnie Hellmann2017-10-111-0/+12
| | |/ / | |/| |
* | | | Merge branch 'docs-patch-28' into 'master'Achilleas Pipinellis2017-10-111-1/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Update image commenting MR linkClement Ho2017-10-111-1/+2
|/ / /
* | | Merge branch 'rs-mysql-groups-dashboard-failure' into 'master'Douwe Maan2017-10-111-10/+10
|\ \ \
| * | | Fix a feature spec failing only on MySQLrs-mysql-groups-dashboard-failureRobert Speicher2017-10-111-10/+10
* | | | Merge branch 'move_markdown_preview_to_concern' into 'master'Sean McGivern2017-10-119-36/+57
|\ \ \ \
| * | | | Add support for markdown preview to group milestonesmove_markdown_preview_to_concernVitaliy @blackst0ne Klachkov2017-10-119-36/+57
* | | | | Merge branch '35580-cannot-import-project-with-milestones' into 'master'Sean McGivern2017-10-116-98/+333
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | fixing group label import35580-cannot-import-project-with-milestonesmicael.bergeron2017-10-062-19/+29
| * | | | adding the new spec filemicael.bergeron2017-10-061-0/+188
| * | | | fix the project import when an issue has a group milestonemicael.bergeron2017-10-053-81/+101
| * | | | fix the spec so it fails before applying the fixmicael.bergeron2017-10-042-4/+16
| * | | | added changelogGitLab Development2017-10-031-0/+5
| * | | | fix the import :milestone from adding the group_idmicael.bergeron2017-10-031-1/+1
* | | | | Merge branch 'gitaly-has-local-branches' into 'master'Rémy Coutable2017-10-114-9/+19
|\ \ \ \ \
| * | | | | Use Gitaly's RepositoryService.HasLocalBranches RPCgitaly-has-local-branchesAlejandro Rodríguez2017-10-104-9/+19
* | | | | | Merge branch '38720-sort-admin-runners' into 'master'Rémy Coutable2017-10-113-2/+8
|\ \ \ \ \ \
| * | | | | | Add sort runners on admin runnersTakuya Noguchi2017-10-043-2/+8
* | | | | | | Merge branch 'fix/sm/move-callback-route-google_api-auth-callback-for-oauth-u...Kamil Trzciński2017-10-112-4/+5
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Remove unnecessary TOLLEVEL routes from path_regex.rbfix/sm/move-callback-route-google_api-auth-callback-for-oauth-underShinya Maeda2017-10-111-1/+0
| * | | | | | Add - before google_api/auth/callbackShinya Maeda2017-10-111-3/+5
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch '37399-simplify-project-page' into 'master'Phil Hughes2017-10-1118-187/+313
|\ \ \ \ \ \
| * | | | | | Simplify project pageAnnabel Dunstone Gray2017-10-1118-187/+313
|/ / / / / /
* | | | | | Merge branch 'milestones-permissions-docs' into 'master'Sean McGivern2017-10-111-1/+2
|\ \ \ \ \ \
| * | | | | | Developer can create/edit/delete milestonesVictor Wu2017-10-111-1/+2
|/ / / / / /
* | | | | | Merge branch 'rc-change-qa-namespace' into 'master'Grzegorz Bizon2017-10-111-1/+1
|\ \ \ \ \ \
| * | | | | | QA group name, use hyphens rather than underscoresRichard Clamp2017-10-101-1/+1
* | | | | | | Merge branch '38869-start' into 'master'Phil Hughes2017-10-112-20/+21
|\ \ \ \ \ \ \
| * | | | | | | Enable eslint in star and remove from main.jsFilipa Lacerda2017-10-112-20/+21
|/ / / / / / /
* | | | | | | Merge branch '38869-labels' into 'master'Phil Hughes2017-10-114-151/+137
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Use ES6 modules in labels and labels managerFilipa Lacerda2017-10-104-151/+137
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'docs-image-discussion' into 'master'Achilleas Pipinellis2017-10-116-3/+40
|\ \ \ \ \ \
| * | | | | | Add image discussion docsClement Ho2017-10-116-3/+40
|/ / / / / /
* | | | | | Merge branch 'rc/refactor-testing-docs' into 'master'Achilleas Pipinellis2017-10-1114-876/+1027
|\ \ \ \ \ \
| * | | | | | Refactor the Development documentation, and divide the Testing documentation ...Rémy Coutable2017-10-1114-876/+1027
|/ / / / / /
* | | | | | Merge branch '38828-update-kubernetes-helm-chart-docs' into 'master'Achilleas Pipinellis2017-10-113-14/+16
|\ \ \ \ \ \
| * | | | | | Update Kubernetes Helm chart docsJoshua Lambert2017-10-113-14/+16
|/ / / / / /
* | | | | | Merge branch 'add-resolve-discussion-test' into 'master'Filipa Lacerda2017-10-101-5/+15
|\ \ \ \ \ \
| * | | | | | Add explicit test to test resolved discussion toggle contentadd-resolve-discussion-testClement Ho2017-10-101-5/+15
| |/ / / / /
* | | | | | Merge branch '36160-select2-dropdown' into 'master'Annabel Dunstone Gray2017-10-102-0/+6
|\ \ \ \ \ \
View Lorry Controller Status