summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Rename .btn-default to .btn-secondaryClement Ho2018-04-0994-130/+130
|
* Rename col-xs-* to col-*Clement Ho2018-04-0918-69/+69
|
* Replace <blockquote> with .blockquoteClement Ho2018-04-092-2/+2
|
* Add .badge-pill to .badge in js filesClement Ho2018-04-091-2/+2
|
* Add badge-pill to .badge in vue filesClement Ho2018-04-092-2/+2
|
* Add badge-pill to .badge in hamlClement Ho2018-04-0932-89/+89
|
* Remove deprecated mixinsClement Ho2018-04-099-9/+25
|
* Ran migration scriptClement Ho2018-04-0968-430/+430
|
* Add bootstrap 3 variable shimClement Ho2018-04-062-0/+14
|
* Use gray colorClement Ho2018-04-061-1/+1
|
* Convert transition-property mixin to propertyClement Ho2018-04-061-1/+1
|
* Import bootstrap 4Clement Ho2018-04-061-2/+1
|
* 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_project Closes #43219 See merge request gitlab-org/gitlab-ce!17730
| * 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
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Allow HTTPS cloning by Runners if it is disabled for users" Closes #44389 See merge request gitlab-org/gitlab-ce!18021
| * | 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
|\ \ | | | | | | | | | | | | | | | | | | Fix `JobsController#raw` endpoint can not read traces in database Closes #44665 See merge request gitlab-org/gitlab-ce!18101
| * | Add change logShinya Maeda2018-04-061-2/+0
| | |
| * | Merge branch '44665-fix-db-trace-stream-by-raw-access' of ↵Shinya Maeda2018-04-051-1/+1
| |\ \ | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into 44665-fix-db-trace-stream-by-raw-access
| | * | 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 rendering Closes #44295 See merge request gitlab-org/gitlab-ce!18201
| * | | | Adjust 404's for LegacyDiffNote discussion renderingOswaldo Ferreira2018-04-051-2/+2
| |/ / /
* | | | Merge branch ↵Clement Ho2018-04-056-47/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '44870-remove-extra-space-around-comment-form-on-merge-requests' into 'master' Resolve HTML/CSS inconsistent comment forms on Issue and Merge Request Closes #44870 See merge request gitlab-org/gitlab-ce!18120
| * | | | Refactor and tweak margin for note forms on IssuableTakuya Noguchi2018-04-046-47/+26
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | Merge branch 'ide-diff-inline' into 'master'Filipa Lacerda2018-04-053-6/+26
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change IDE diff view responsively Closes #44305 See merge request gitlab-org/gitlab-ce!18049
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | Closes #44305
* | | | | | Merge branch ↵Douwe Maan2018-04-054-18/+34
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '43098-controller-projects-issuescontroller-show-executes-more-than-100-sql-queries' into 'master' Resolve "Controller Projects::IssuesController#show executes more than 100 SQL queries" Closes #43098 See merge request gitlab-org/gitlab-ce!17986
| * | | | | | Fix N+1 in MergeRequestParserSean McGivern2018-04-054-18/+34
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | read_project can be prevented by a very expensive condition, which we want to avoid, while still not writing manual SQL queries. read_project_for_iids is used by read_issue_iid and read_merge_request_iid to satisfy both of those constraints, and allow the declarative policy runner to use its normal caching strategy.
* | | | | | Merge branch 'bvl-override-import-params' into 'master'Douwe Maan2018-04-052-3/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow passing params to import API to override project attributes Closes gitlab-ee#4788 See merge request gitlab-org/gitlab-ce!18086
| * | | | | | Don't export `Project#description_html`Bob Van Landuyt2018-04-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we can regenerate `description_html` from the `description`, we should not export it. This avoids some complexity when overriding the description during an import/export where we would need to invalidate this cached field. Now we refresh the markdown cache after the import
| * | | | | | Store override params as import data on projectsBob Van Landuyt2018-04-042-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This means import data doesn't necessarily have to have an import_url anymore. The `ProjectImportData` could just contain the override data in it's serialized data attribute. The import data is automatically cleaned up after it is finished by the state machine.
* | | | | | | Merge branch 'use-chronic-duration-attribute-for-project-build-timeout' into ↵Kamil Trzciński2018-04-059-62/+66
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Use chronic duration attribute for project build timeout See merge request gitlab-org/gitlab-ce!17386
| * | | | | | | 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 in notes-related code See merge request gitlab-org/gitlab-ce!18150
| * | | | | | | Better group support notes-related codeJan Provaznik2018-04-054-4/+10
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates notes-related services and rendering so this code can be easily used for group-scoped resources (specifically Epics). Related to gitlab-ee!5205
* | | | | | | Merge branch 'jacoco' into 'master'Kamil Trzciński2018-04-051-0/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JaCoCo example See merge request gitlab-org/gitlab-ce!17969
| * | | | | | | 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 Storage See merge request gitlab-org/gitlab-ce!18156
| * | | | | | | | Allow to store uploads by default on Object Storagedirect-upload-of-uploadsKamil Trzciński2018-04-041-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce `direct_upload` option for `uploads` which is gonna set a default storage to Object Storage and use Unicorn to save data
View Lorry Controller Status