summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sh-fix-recaptcha-test' into 'master'Stan Hu2018-04-101-1/+1
* Merge branch '43976-fix-access-token-clipboard-button-style' into 'master'Phil Hughes2018-04-062-8/+5
|\
| * Fix personal access token clipboard button styleFabian Schneider2018-03-252-8/+5
* | Polish design of domain verification for Gitlab PagesLukas Eipert2018-04-068-47/+129
* | Merge branch 'sh-appearance-cache-key-version' into 'master'Douwe Maan2018-04-061-1/+1
|\ \
| * | Use the GitLab version as part of the appearances cache keysh-appearance-cache-key-versionStan Hu2018-04-051-1/+1
* | | Resolve "Show `failure_reason` and upgrade tooltips of jobs"Mayra Cabrera2018-04-0510-19/+47
* | | Merge branch 'direct-upload-of-artifacts' into 'master'Grzegorz Bizon2018-04-055-38/+44
|\ \ \
| * | | Add `direct_upload` setting for artifactsdirect-upload-of-artifactsKamil Trzciński2018-04-055-38/+44
* | | | Merge branch 'improve-jobs-queuing-time-metric' into 'master'jramsay-masterKamil Trzciński2018-04-051-2/+17
|\ \ \ \
| * | | | Partition job_queue_duration_seconds with jobs_running_for_projectTomasz Maczukin2018-04-051-2/+17
* | | | | Merge branch '44389-always-allow-http-for-ci-git-operations' into 'master'Kamil Trzciński2018-04-052-1/+2
|\ \ \ \ \
| * | | | | Allow HTTP(s) when git request is made by GitLab CITomasz Maczukin2018-04-052-1/+2
| |/ / / /
* | | | | Merge branch '44665-fix-db-trace-stream-by-raw-access' into 'master'Kamil Trzciński2018-04-051-1/+1
|\ \ \ \ \
| * | | | | Add change logShinya Maeda2018-04-061-2/+0
| * | | | | Merge branch '44665-fix-db-trace-stream-by-raw-access' of gitlab.com:gitlab-o...Shinya Maeda2018-04-051-1/+1
| |\ \ \ \ \
| | * | | | | Update jobs_controller.rbShinya Maeda2018-04-031-1/+1
| | * | | | | Update jobs_controller.rbShinya Maeda2018-04-031-2/+0
| | * | | | | FixShinya Maeda2018-04-031-11/+21
| | * | | | | Fix database trace to read rawShinya Maeda2018-04-031-19/+11
| * | | | | | FixShinya Maeda2018-04-051-11/+21
| * | | | | | Fix database trace to read rawShinya Maeda2018-04-051-19/+11
* | | | | | | Merge branch 'osw-44295-adjust-authorization-for-discussions-show' into 'master'Sean McGivern2018-04-051-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Adjust 404's for LegacyDiffNote discussion renderingOswaldo Ferreira2018-04-051-2/+2
| |/ / / / / /
* | | | | | | Merge branch '44870-remove-extra-space-around-comment-form-on-merge-requests'...Clement Ho2018-04-056-47/+26
|\ \ \ \ \ \ \
| * | | | | | | Refactor and tweak margin for note forms on IssuableTakuya Noguchi2018-04-046-47/+26
* | | | | | | | Merge branch 'ide-diff-inline' into 'master'Filipa Lacerda2018-04-053-6/+26
|\ \ \ \ \ \ \ \
| * | | | | | | | fixed eslintPhil Hughes2018-04-051-3/+3
| * | | | | | | | set `renderSideBySide` when creating diff instancePhil Hughes2018-04-051-1/+6
| * | | | | | | | updated wordWrap option be `on`Phil Hughes2018-04-051-1/+1
| * | | | | | | | Change IDE diff view responsivelyPhil Hughes2018-04-052-5/+20
* | | | | | | | | Merge branch '43098-controller-projects-issuescontroller-show-executes-more-t...Douwe Maan2018-04-054-18/+34
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix N+1 in MergeRequestParserSean McGivern2018-04-054-18/+34
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'bvl-override-import-params' into 'master'Douwe Maan2018-04-052-3/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Don't export `Project#description_html`Bob Van Landuyt2018-04-051-0/+1
| * | | | | | | | | Store override params as import data on projectsBob Van Landuyt2018-04-042-3/+4
* | | | | | | | | | Merge branch 'use-chronic-duration-attribute-for-project-build-timeout' into ...Kamil Trzciński2018-04-059-62/+66
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Specify default value for Project#build_timeoutTomasz Maczukin2018-04-042-4/+4
| * | | | | | | | | | Move leftovers from pipelines_settings_controller to settings/ci_cd_controllerTomasz Maczukin2018-04-046-47/+52
| * | | | | | | | | | Use ChronicDurationAttribute to handle CI/CD timeout settingTomasz Maczukin2018-04-044-13/+12
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jprovazn-comment-refs' into 'master'Sean McGivern2018-04-054-4/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Better group support notes-related codeJan Provaznik2018-04-054-4/+10
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jacoco' into 'master'Kamil Trzciński2018-04-051-0/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | JaCoCo regex has been added to the examples block of Test coverage parsingRuslan Molchanov2018-03-231-0/+3
* | | | | | | | | | | Web IDE markdown previewTim Zallmann2018-04-0513-93/+339
* | | | | | | | | | | Merge branch 'direct-upload-of-uploads' into 'master'Grzegorz Bizon2018-04-051-3/+11
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| * | | | | | | | | | Allow to store uploads by default on Object Storagedirect-upload-of-uploadsKamil Trzciński2018-04-041-3/+11
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'dm-internal-user-namespace' into 'master'Sean McGivern2018-04-051-1/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Ensure internal users (ghost, support bot) get assigned a namespacedm-internal-user-namespaceDouwe Maan2018-04-051-1/+3
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'ce-4474-custom-additional-text-in-confirmation-email' into 'mas...Sean McGivern2018-04-051-2/+1
|\ \ \ \ \ \ \ \ \ \