summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Migrate Gitlab::Git::Wiki#write_page to Gitalyfeature/migrate-wiki-write-page-to-gitalyAhmad Sherif2017-10-161-24/+34
* Merge branch 'gitaly-merge' into 'master'Sean McGivern2017-10-132-10/+59
|\
| * Merge Merge Requests via GitalyJacob Vosmaer2017-10-132-10/+59
* | Merge branch 'server-flash-click-remove' into 'master'Filipa Lacerda2017-10-131-0/+21
|\ \ | |/ |/|
| * Fixed server rendered flash not being removed on clickserver-flash-click-removePhil Hughes2017-10-131-0/+21
* | Merge branch 'backport-ee-2869' into 'master'Sean McGivern2017-10-132-15/+33
|\ \
| * | backport for gitlab-ee!2869backport-ee-2869Simon Knox2017-10-132-15/+33
| |/
* | Merge branch '39032-improve-merge-ongoing-check-consistency' into 'master'Sean McGivern2017-10-132-1/+33
|\ \ | |/ |/|
| * Simplify check for running job on Redis39032-improve-merge-ongoing-check-consistencyOswaldo Ferreira2017-10-132-2/+14
| * Make "merge ongoing" check more consistentOswaldo Ferreira2017-10-111-1/+21
* | Add create merge checkbox.Jacob Schatz2017-10-122-57/+117
* | Merge branch '26763-grant-registry-auth-scope-to-admins' into 'master'Kamil Trzciński2017-10-121-1/+49
|\ \
| * | fix code style issuesVratislav Kalenda2017-10-101-2/+10
| * | fix lintVratislav Kalenda2017-10-081-6/+3
| * | remove whitespaceVratislav Kalenda2017-10-081-3/+1
| * | Issue JWT token with registry:catalog:* scope when requested by GitLab adminVratislav Kalenda2017-10-081-0/+45
* | | Merge branch 'fix/rugged-alternate-paths' into 'master'Douwe Maan2017-10-121-2/+2
|\ \ \
| * | | Fix the format of rugged alternate directory listfix/rugged-alternate-pathsAhmad Sherif2017-10-121-2/+2
* | | | Merge branch '34897-delete-branch-after-merge' into 'master'Sean McGivern2017-10-122-7/+22
|\ \ \ \
| * | | | add specmicael.bergeron2017-10-112-7/+22
* | | | | Merge branch 'gitaly-fetch-remote' into 'master'Dmitriy Zaporozhets2017-10-121-0/+15
|\ \ \ \ \
| * | | | | Add `Gitlab::Git::Repository#fetch` commandgitaly-fetch-remoteAlejandro Rodríguez2017-10-091-0/+15
* | | | | | Merge branch '37691-subscription-fires-multiple-notifications' into 'master'Sean McGivern2017-10-122-7/+19
|\ \ \ \ \ \
| * | | | | | fix a wrong method call in the refactormicael.bergeron2017-10-121-1/+1
| * | | | | | fix multiple notifications from being sent for multiple labelsmicael.bergeron2017-10-102-7/+19
* | | | | | | Merge branch 'cache-issuable-template-names' into 'master'Douwe Maan2017-10-122-1/+15
|\ \ \ \ \ \ \
| * | | | | | | Cache issuable template namesSean McGivern2017-10-122-1/+11
| * | | | | | | Match full file path in FileDetectorSean McGivern2017-10-121-0/+4
* | | | | | | | Merge branch 'dm-api-authentication' into 'master'Robert Speicher2017-10-122-13/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | Move all API authentication code to APIGuardDouwe Maan2017-10-122-13/+13
* | | | | | | | | Resolve "Prometheus service page shows error"Jose Ivan Vargas Lopez2017-10-121-4/+8
|/ / / / / / / /
* | | | | | | | Merge branch '38871-cleanup-data-page-attribute-after-karma-test' into 'master'Clement Ho2017-10-116-16/+50
|\ \ \ \ \ \ \ \
| * | | | | | | | Cleanup data-page attribute after each Karma test38871-cleanup-data-page-attribute-after-karma-testEric Eastwood2017-10-116-16/+50
* | | | | | | | | Merge branch 'replace_explore_projects.feature' into 'master'Rémy Coutable2017-10-115-70/+372
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Replace the 'features/explore/projects.feature' spinach test with an rspec an...replace_explore_projects.featureVitaliy @blackst0ne Klachkov2017-10-115-70/+372
* | | | | | | | | Merge branch 'ph-gl-form-js-modules' into 'master'Filipa Lacerda2017-10-113-110/+99
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | spec fixesph-gl-form-js-modulesPhil Hughes2017-10-112-19/+10
| * | | | | | | | | Moves form related JS modules out of globalPhil Hughes2017-10-111-91/+89
* | | | | | | | | | 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-112-22/+43
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | / / | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Pass git object dir attributes as relative paths to GitalyAhmad Sherif2017-10-112-22/+43
* | | | | | | | | 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-111-0/+21
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add support for markdown preview to group milestonesmove_markdown_preview_to_concernVitaliy @blackst0ne Klachkov2017-10-111-0/+21
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch '35580-cannot-import-project-with-milestones' into 'master'Sean McGivern2017-10-113-80/+293
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | fixing group label import35580-cannot-import-project-with-milestonesmicael.bergeron2017-10-061-2/+2
| * | | | | | | | adding the new spec filemicael.bergeron2017-10-061-0/+188
| * | | | | | | | fix the project import when an issue has a group milestonemicael.bergeron2017-10-052-79/+92