summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Checks if commit information exists before trying to render it44296-commit-pathFilipa Lacerda2018-04-063-49/+104
|
* Merge branch 'blackst0ne-rails5-fix-type-cast-for-from-database' into 'master'blackst0ne-rails5-update-skip-befor-action-in-authenticates-with-two-factor-concernSean McGivern2018-04-066-34/+66
|\ | | | | | | | | [Rails5] Update `type_cast_*_database` methods See merge request gitlab-org/gitlab-ce!18188
| * [Rails5] Update `type_cast_*_database` methodsblackst0ne2018-04-066-34/+66
|/
* Merge branch '44939-epic-comment-thread-backports' into 'master'Fatih Acet2018-04-069-33/+25
|\ | | | | | | | | | | | | Resolve "Follow-up from "Refactor discussions/notes code"" Closes #44939 See merge request gitlab-org/gitlab-ce!18190
| * Add noteableType to mock data object44939-epic-comment-thread-backportsKushal Pandya2018-04-061-0/+1
| |
| * Set `noteable_type` to use in notesAppKushal Pandya2018-04-062-0/+2
| |
| * Return noteableType from app initial configKushal Pandya2018-04-061-10/+1
| |
| * Use noteable type map from constantsKushal Pandya2018-04-061-10/+1
| |
| * Add map for supported noteable typesKushal Pandya2018-04-061-0/+6
| |
| * Set noteableType on noteableData as provided from DOM datasetKushal Pandya2018-04-051-1/+4
| |
| * Use `isInVueNoteablePage` from dom_utilsKushal Pandya2018-04-051-11/+4
| |
| * Add page helper methods for notesAppKushal Pandya2018-04-051-1/+6
| |
* | Merge branch ↵Filipa Lacerda2018-04-0610-66/+400
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '41758-after-changing-username-url-still-redirects-to-old-route' into 'master' Add confirmation modal to "Change username" Closes #41758 See merge request gitlab-org/gitlab-ce!17405
| * | Add confirmation modal to "Change username"Shah El-Rahman2018-04-0610-66/+400
|/ /
* | Merge branch 'issue_44270' into 'master'Sean McGivern2018-04-0624-55/+75
|\ \ | | | | | | | | | | | | | | | | | | Show issues of subgroups in group-level issue board Closes #44270 See merge request gitlab-org/gitlab-ce!18187
| * | Fix rubocopissue_44270Felipe Artur2018-04-051-1/+1
| | |
| * | Fix rubocopFelipe Artur2018-04-051-1/+1
| | |
| * | Improve specs and docsFelipe Artur2018-04-053-5/+6
| | |
| * | Fix more specsFelipe Artur2018-04-055-4/+6
| | |
| * | Fix specsFelipe Artur2018-04-053-6/+6
| | |
| * | Show issues of subgroups in group-level issue boardFelipe Artur2018-04-0518-45/+62
| | |
* | | Merge branch 'ui-mr-counter-cache' into 'master'Sean McGivern2018-04-064-7/+18
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Deleting a MR you are assigned to should decrements counter Closes #44458 See merge request gitlab-org/gitlab-ce!17951
| * | | Deleting a MR you are assigned to should decrements counterm b2018-04-054-7/+18
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | The merge request counter in the UI was not decreasing when a merge request was deleting. This was just due to the cache not being refreshed on a delete action. fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/44458
* | | Merge branch 'nathan.jones/gitlab-ce-patch-24' into 'master'Rémy Coutable2018-04-061-1/+8
|\ \ \ | | | | | | | | | | | | | | | | Update index.md to describe leaving out the host in prometheus['listen_address']… See merge request gitlab-org/gitlab-ce!18207
| * | | Update index.md to describe leaving out the host in ↵nathan.jones/gitlab-ce-patch-24Nathan Jones2018-04-051-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | prometheus['listen_address'] to allow public access. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'issue_42443' into 'master'Sean McGivern2018-04-063-1/+30
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include subgroup issues when searching for group issues using the API Closes #42443 See merge request gitlab-org/gitlab-ce!18068
| * | | | Include subgroup issues when searching for group issues using the APIissue_42443Felipe Artur2018-04-053-1/+30
| | | | |
* | | | | Merge branch '43976-fix-access-token-clipboard-button-style' into 'master'Phil Hughes2018-04-063-8/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Access token copy to clipboard button has wrong style" Closes #43976 See merge request gitlab-org/gitlab-ce!17978
| * | | | | Fix personal access token clipboard button styleFabian Schneider2018-03-253-8/+10
| | | | | |
* | | | | | Merge branch '43215-update-design-for-verifying-domains' into 'master'Phil Hughes2018-04-069-47/+134
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Polish design of domain verification for Gitlab Pages Closes #43215 See merge request gitlab-org/gitlab-ce!17767
| * | | | | | Polish design of domain verification for Gitlab PagesLukas Eipert2018-04-069-47/+134
|/ / / / / /
* | | | | | Merge branch 'sh-appearance-cache-key-version' into 'master'Douwe Maan2018-04-062-1/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the GitLab version as part of the appearances cache key Closes gitlab-ee#5571 See merge request gitlab-org/gitlab-ce!18211
| * | | | | | Use the GitLab version as part of the appearances cache keysh-appearance-cache-key-versionStan Hu2018-04-052-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents us from having to manually flush the cache key in migrations every time a new column is added. Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/5571
* | | | | | | Merge branch '45070-prometheus-integration-via-kubernetes-is-broken' into ↵Kamil Trzciński2018-04-062-0/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Override Prometheus service name to fix integration with GitLab. Closes #45070 See merge request gitlab-org/gitlab-ce!18206
| * | | | | | | Add changelog item45070-prometheus-integration-via-kubernetes-is-brokenJoshua Lambert2018-04-051-0/+5
| | | | | | | |
| * | | | | | | Override the Prometheus server nameJoshua Lambert2018-04-051-0/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch '44269-show-failure-reason-on-upgrade-tooltip-of-jobs' into ↵Grzegorz Bizon2018-04-0539-38/+635
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Show `failure_reason` and upgrade tooltips of jobs" Closes #44269 See merge request gitlab-org/gitlab-ce!17782
| * | | | | | | Resolve "Show `failure_reason` and upgrade tooltips of jobs"Mayra Cabrera2018-04-0539-38/+635
|/ / / / / / /
* | | | | | | Merge branch 'direct-upload-of-artifacts' into 'master'Grzegorz Bizon2018-04-0522-280/+467
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Direct upload of artifacts See merge request gitlab-org/gitlab-ce!18160
| * | | | | | | Add `direct_upload` setting for artifactsdirect-upload-of-artifactsKamil Trzciński2018-04-0520-220/+465
| | | | | | | |
| * | | | | | | Remove artifacts_file/metadata from project exportKamil Trzciński2018-04-052-60/+2
| | | | | | | |
* | | | | | | | Merge branch 'improve-jobs-queuing-time-metric' into 'master'jramsay-masterKamil Trzciński2018-04-054-4/+104
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Partition job_queue_duration_seconds with jobs_running_for_project Closes #43219 See merge request gitlab-org/gitlab-ce!17730
| * | | | | | | | Add CHANGELOG entryTomasz Maczukin2018-04-051-0/+5
| | | | | | | | |
| * | | | | | | | Partition job_queue_duration_seconds with jobs_running_for_projectTomasz Maczukin2018-04-053-4/+99
| | | | | | | | |
* | | | | | | | | Merge branch '44389-always-allow-http-for-ci-git-operations' into 'master'Kamil Trzciński2018-04-056-7/+50
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Allow HTTPS cloning by Runners if it is disabled for users" Closes #44389 See merge request gitlab-org/gitlab-ce!18021
| * | | | | | | | | Update documentationTomasz Maczukin2018-04-051-3/+9
| | | | | | | | | |
| * | | | | | | | | Add CHANGELOG entryTomasz Maczukin2018-04-051-0/+5
| | | | | | | | | |
| * | | | | | | | | Allow HTTP(s) when git request is made by GitLab CITomasz Maczukin2018-04-054-4/+36
| |/ / / / / / / /
* | | | | | | | | Merge branch '44665-fix-db-trace-stream-by-raw-access' into 'master'Kamil Trzciński2018-04-054-3/+29
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-062-2/+5
| | | | | | | | |