summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Revert "Merge branch '32908-edit-comment' into 'master'"Clement Ho2017-05-251-39/+0
* Escapes html content before appending it to the DOMFilipa Lacerda2017-05-251-0/+39
* Merge branch 'dm-copy-as-gfm-without-empty-elements' into 'master'Filipa Lacerda2017-05-241-3/+13
|\
| * Add specDouwe Maan2017-05-231-0/+13
| * Don't copy empty elements that were not selected on purpose as GFMDouwe Maan2017-05-181-3/+0
* | Merge branch 'dm-outdated-system-note' into 'master'Grzegorz Bizon2017-05-2410-95/+353
|\ \
| * | Address reviewDouwe Maan2017-05-242-1/+27
| * | Fix specsdm-outdated-system-noteDouwe Maan2017-05-233-2/+9
| * | Add system note with link to diff comparison when MR discussion becomes outdatedDouwe Maan2017-05-236-93/+318
* | | Merge branch '32170-assignees-spinner' into 'master'Phil Hughes2017-05-242-0/+17
|\ \ \
| * | | add loading spinner to sidebar assignees32170-assignees-spinnerSimon Knox2017-05-242-0/+17
* | | | Merge branch 'fix-eslint' into 'master'Tim Zallmann2017-05-242-2/+2
|\ \ \ \
| * | | | Use import instead of requirefix-eslintClement Ho2017-05-242-2/+2
* | | | | Merge branch 'dm-fix-routes' into 'master'Robert Speicher2017-05-245-226/+398
|\ \ \ \ \
| * | | | | Remove changes that are not absolutely necessarydm-fix-routesDouwe Maan2017-05-2310-459/+453
| * | | | | Fix specsDouwe Maan2017-05-234-49/+63
| * | | | | Fix ambiguous routing issues by teaching router about reserved wordsDouwe Maan2017-05-237-256/+420
* | | | | | Merge branch '29852-latex-formatting' into 'master'Robert Speicher2017-05-244-0/+90
|\ \ \ \ \ \
| * | | | | | Fix LaTeX formatting for AsciiDoc wikiJarka Kadlecova2017-05-244-0/+90
* | | | | | | Merge branch 'wait-for-ajax-handling-all-js-requests' into 'master'Douwe Maan2017-05-24101-436/+381
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Use wait_for_requests to wait all JS requestwait-for-ajax-handling-all-js-requestsOswaldo Ferreira2017-05-22101-436/+381
* | | | | | | Merge branch 'dm-paste-code-inside-gfm-code' into 'master'Filipa Lacerda2017-05-241-0/+49
|\ \ \ \ \ \ \
| * | | | | | | Add specdm-paste-code-inside-gfm-codeDouwe Maan2017-05-231-0/+49
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch '32563-remove-duplicated-config-code-for-filtered-search-dropdow...Phil Hughes2017-05-245-17/+33
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Port EE changes32563-remove-duplicated-config-code-for-filtered-search-dropdownsClement Ho2017-05-235-17/+33
* | | | | | | Merge branch 'sentry-clientside-releases' into 'master'Phil Hughes2017-05-242-32/+30
|\ \ \ \ \ \ \
| * | | | | | | Use Gitlab::REVISION over reading HEAD sha from gitsentry-clientside-releasesLuke "Jared" Bennett2017-05-212-23/+22
| * | | | | | | Read HEAD commit and use as releases valueLuke "Jared" Bennett2017-05-192-18/+17
* | | | | | | | Merge branch 'acet-fix-mr-widget-state' into 'master'Douwe Maan2017-05-231-6/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | MRWidget: Change order of if blocks to determine widget state properly.acet-fix-mr-widget-stateFatih Acet2017-05-241-6/+6
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'fix-notify-post-receive' into 'master'Stan Hu2017-05-231-80/+81
|\ \ \ \ \ \ \ \
| * | | | | | | | Prevent errors from non-functional notify_post_receive endpointfix-notify-post-receiveAlejandro Rodríguez2017-05-181-80/+81
* | | | | | | | | Merge branch '32509-next-run-in-pipeline-schedules-shows-past-time' into 'mas...Kamil Trzciński2017-05-231-1/+2
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Test for next_run_at in the view.32509-next-run-in-pipeline-schedules-shows-past-timeBryce Johnson2017-05-231-1/+2
* | | | | | | | | Merge branch 'issue_32225' into 'master'Robert Speicher2017-05-2312-50/+42
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add transient head_pipeline_of to pipeline factoriesissue_32225Felipe Artur2017-05-2212-50/+42
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'zj-fix-pipeline-etag' into 'master'Kamil Trzciński2017-05-234-0/+54
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Test the ExpireJobCacheWorker and related changeszj-fix-pipeline-etagZ.J. van de Weg2017-05-223-0/+43
| * | | | | | | | Add Etag caching for Pipeline#Show actionZ.J. van de Weg2017-05-221-0/+11
* | | | | | | | | Merge branch 'add-unicode-trace-feature-test' into 'master'Kamil Trzciński2017-05-232-42/+25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add feature test with unicode traceadd-unicode-trace-feature-testShinya Maeda2017-05-232-42/+25
* | | | | | | | | | Merge branch '17489-hide-code-from-guests' into 'master'Douwe Maan2017-05-231-3/+59
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 17489-hide-code...Valery Sizov2017-05-23460-3369/+12556
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix review comment17489-hide-code-from-guestsValery Sizov2017-05-231-15/+24
| * | | | | | | | | | | Hide clone panel and file list when user is only a guestJames Clark2017-05-071-1/+48
* | | | | | | | | | | | Merge branch 'fix-backup-raketask' into 'master'Timothy Andrew2017-05-231-11/+19
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix testsAchilleas Pipinellis2017-05-231-14/+15
| * | | | | | | | | | | | Add tests for removing old backups with the new timestampAchilleas Pipinellis2017-05-231-6/+13
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'winh-frontend-user-cache' into 'master'Filipa Lacerda2017-05-232-0/+201
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add frontend UsersCache class (!11404)winh-frontend-user-cachewinh2017-05-231-0/+136