Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add rss_token attribute to user model | Alexis Reigel | 2017-05-24 | 1 | -0/+7 |
* | Merge branch 'dm-copy-as-gfm-without-empty-elements' into 'master' | Filipa Lacerda | 2017-05-24 | 1 | -3/+13 |
|\ | |||||
| * | Add spec | Douwe Maan | 2017-05-23 | 1 | -0/+13 |
| * | Don't copy empty elements that were not selected on purpose as GFM | Douwe Maan | 2017-05-18 | 1 | -3/+0 |
* | | Merge branch 'dm-outdated-system-note' into 'master' | Grzegorz Bizon | 2017-05-24 | 10 | -95/+353 |
|\ \ | |||||
| * | | Address review | Douwe Maan | 2017-05-24 | 2 | -1/+27 |
| * | | Fix specsdm-outdated-system-note | Douwe Maan | 2017-05-23 | 3 | -2/+9 |
| * | | Add system note with link to diff comparison when MR discussion becomes outdated | Douwe Maan | 2017-05-23 | 6 | -93/+318 |
* | | | Merge branch '32170-assignees-spinner' into 'master' | Phil Hughes | 2017-05-24 | 2 | -0/+17 |
|\ \ \ | |||||
| * | | | add loading spinner to sidebar assignees32170-assignees-spinner | Simon Knox | 2017-05-24 | 2 | -0/+17 |
* | | | | Merge branch 'fix-eslint' into 'master' | Tim Zallmann | 2017-05-24 | 2 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | Use import instead of requirefix-eslint | Clement Ho | 2017-05-24 | 2 | -2/+2 |
* | | | | | Merge branch 'dm-fix-routes' into 'master' | Robert Speicher | 2017-05-24 | 5 | -226/+398 |
|\ \ \ \ \ | |||||
| * | | | | | Remove changes that are not absolutely necessarydm-fix-routes | Douwe Maan | 2017-05-23 | 10 | -459/+453 |
| * | | | | | Fix specs | Douwe Maan | 2017-05-23 | 4 | -49/+63 |
| * | | | | | Fix ambiguous routing issues by teaching router about reserved words | Douwe Maan | 2017-05-23 | 7 | -256/+420 |
* | | | | | | Merge branch '29852-latex-formatting' into 'master' | Robert Speicher | 2017-05-24 | 4 | -0/+90 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix LaTeX formatting for AsciiDoc wiki | Jarka Kadlecova | 2017-05-24 | 4 | -0/+90 |
* | | | | | | | Merge branch 'wait-for-ajax-handling-all-js-requests' into 'master' | Douwe Maan | 2017-05-24 | 101 | -436/+381 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Use wait_for_requests to wait all JS requestwait-for-ajax-handling-all-js-requests | Oswaldo Ferreira | 2017-05-22 | 101 | -436/+381 |
* | | | | | | | Merge branch 'dm-paste-code-inside-gfm-code' into 'master' | Filipa Lacerda | 2017-05-24 | 1 | -0/+49 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add specdm-paste-code-inside-gfm-code | Douwe Maan | 2017-05-23 | 1 | -0/+49 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch '32563-remove-duplicated-config-code-for-filtered-search-dropdow... | Phil Hughes | 2017-05-24 | 5 | -17/+33 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | Port EE changes32563-remove-duplicated-config-code-for-filtered-search-dropdowns | Clement Ho | 2017-05-23 | 5 | -17/+33 |
* | | | | | | | Merge branch 'sentry-clientside-releases' into 'master' | Phil Hughes | 2017-05-24 | 2 | -32/+30 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Use Gitlab::REVISION over reading HEAD sha from gitsentry-clientside-releases | Luke "Jared" Bennett | 2017-05-21 | 2 | -23/+22 |
| * | | | | | | | Read HEAD commit and use as releases value | Luke "Jared" Bennett | 2017-05-19 | 2 | -18/+17 |
* | | | | | | | | Merge branch 'acet-fix-mr-widget-state' into 'master' | Douwe Maan | 2017-05-23 | 1 | -6/+6 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | MRWidget: Change order of if blocks to determine widget state properly.acet-fix-mr-widget-state | Fatih Acet | 2017-05-24 | 1 | -6/+6 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'fix-notify-post-receive' into 'master' | Stan Hu | 2017-05-23 | 1 | -80/+81 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Prevent errors from non-functional notify_post_receive endpointfix-notify-post-receive | Alejandro Rodríguez | 2017-05-18 | 1 | -80/+81 |
* | | | | | | | | | Merge branch '32509-next-run-in-pipeline-schedules-shows-past-time' into 'mas... | Kamil Trzciński | 2017-05-23 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Test for next_run_at in the view.32509-next-run-in-pipeline-schedules-shows-past-time | Bryce Johnson | 2017-05-23 | 1 | -1/+2 |
* | | | | | | | | | Merge branch 'issue_32225' into 'master' | Robert Speicher | 2017-05-23 | 12 | -50/+42 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add transient head_pipeline_of to pipeline factoriesissue_32225 | Felipe Artur | 2017-05-22 | 12 | -50/+42 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'zj-fix-pipeline-etag' into 'master' | Kamil Trzciński | 2017-05-23 | 4 | -0/+54 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Test the ExpireJobCacheWorker and related changeszj-fix-pipeline-etag | Z.J. van de Weg | 2017-05-22 | 3 | -0/+43 |
| * | | | | | | | | Add Etag caching for Pipeline#Show action | Z.J. van de Weg | 2017-05-22 | 1 | -0/+11 |
* | | | | | | | | | Merge branch 'add-unicode-trace-feature-test' into 'master' | Kamil Trzciński | 2017-05-23 | 2 | -42/+25 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add feature test with unicode traceadd-unicode-trace-feature-test | Shinya Maeda | 2017-05-23 | 2 | -42/+25 |
* | | | | | | | | | | Merge branch '17489-hide-code-from-guests' into 'master' | Douwe Maan | 2017-05-23 | 1 | -3/+59 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 17489-hide-code... | Valery Sizov | 2017-05-23 | 460 | -3369/+12556 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Fix review comment17489-hide-code-from-guests | Valery Sizov | 2017-05-23 | 1 | -15/+24 |
| * | | | | | | | | | | | Hide clone panel and file list when user is only a guest | James Clark | 2017-05-07 | 1 | -1/+48 |
* | | | | | | | | | | | | Merge branch 'fix-backup-raketask' into 'master' | Timothy Andrew | 2017-05-23 | 1 | -11/+19 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Fix tests | Achilleas Pipinellis | 2017-05-23 | 1 | -14/+15 |
| * | | | | | | | | | | | | Add tests for removing old backups with the new timestamp | Achilleas Pipinellis | 2017-05-23 | 1 | -6/+13 |
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'winh-frontend-user-cache' into 'master' | Filipa Lacerda | 2017-05-23 | 2 | -0/+201 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Add frontend UsersCache class (!11404)winh-frontend-user-cache | winh | 2017-05-23 | 1 | -0/+136 |
| * | | | | | | | | | | | | Extract Cache class from AjaxCache | winh | 2017-05-21 | 1 | -0/+65 |