delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \|	Don't persist ApplicationSetting in test envdont-persist-application-settings-in-test-env	Rémy Coutable	2017-01-15	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch '26138-combine-webhooks-and-services-settings-pages' into 'master'	Rémy Coutable	2017-01-20	1	-0/+20
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moved the webhooks and services gear options to a single one called integrations See merge request !8380
\| * \| \| \| \| \|	Corrected code style and titles	Jose Ivan Vargas	2017-01-18	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fixed more tests	Jose Ivan Vargas	2017-01-18	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fixed spinach feature tests for the services and hooks controllers	Jose Ivan Vargas	2017-01-18	1	-0/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added a test for the integrations controller
* \| \| \| \| \| \|	Merge branch '26117-sort-pipeline-for-commit' into 'master'	Kamil Trzciński	2017-01-19	1	-3/+35
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add sorting pipelines for a commit Closes #26117 See merge request !8319
\| * \| \| \| \| \| \|	Add sorting pipeline for a commit	Takuya Noguchi	2017-01-19	1	-3/+35
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'zj-fix-admin-templates' into 'master'	Kamil Trzciński	2017-01-19	1	-0/+26
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Slash command templates Closes #26042 See merge request !8320
\| * \| \| \| \| \| \|	Add tests for admin service templateszj-fix-admin-templates	Z.J. van de Weg	2017-01-06	1	-0/+26
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'backport-time-tracking-ce' into 'master'	Douwe Maan	2017-01-18	1	-16/+32
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport timetracking to CE See merge request !8195
\| * \| \| \| \| \| \|	Backport backend work for time tracking.	Ruben Davila	2017-01-15	1	-16/+32
\| \| \|_\|/ / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'i-#25814-500-error' into 'master'	Sean McGivern	2017-01-18	1	-0/+30
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Compare page throws 500 error when any branch/reference is not selected Closes #25814 See merge request !8523
\| * \ \ \ \ \ \	Merge branch 'master' into i-#25814-500-error	Martin Cabrera	2017-01-16	1	-1/+1
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Added specs for the preservation of the from/to parameter	Martin Cabrera	2017-01-15	1	-1/+21
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'master' into i-#25814-500-error	Martin Cabrera	2017-01-15	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / \| \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Added specs for branches compare when from & to are empty	Martin Cabrera	2017-01-10	1	-0/+10
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '24915_merge_slash_command' into 'master'	Sean McGivern	2017-01-17	2	-0/+116
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support `/merge` slash command for MRs Closes #24915 See merge request !7746
\| * \| \| \| \| \| \| \|	Address MR comments	Jarka Kadlecova	2017-01-13	1	-3/+19
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	refresh merge widget after using /merge command	Jarka Kadlecova	2017-01-11	1	-0/+52
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	support `/merge` slash comand for MRs	Jarka Kadlecova	2017-01-11	1	-0/+48
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Fix to display notice when project settings updated.	sandish chen	2017-01-15	1	-1/+1
\| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change validity checking for UpdateService. Add return value for project update service. Return 302(redirect_to) when successfully updated. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	fixes the issue	Tiago Botelho	2017-01-12	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'master' into auto-pipelines-vue	Regis	2017-01-09	3	-10/+24
\|\ \ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|
\| * \| \| \| \|	Merge branch '25985-combine-members-and-groups-settings-pages' into 'master'	Alfredo Sumaran	2017-01-06	3	-10/+24
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moved the members and groups to single option called members Closes #25985 See merge request !8281
\| \| * \| \| \| \|	Fixed tests	Jose Ivan Vargas	2017-01-03	1	-3/+3
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Added tests for the MembersController and corrected some more tests	Jose Ivan Vargas	2017-01-03	1	-0/+14
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Removed the "Groups" option from the settings gear	Jose Ivan Vargas	2017-01-03	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed more tests
\| \| * \| \| \| \|	Fixed rspec tests for the project members also fixed the index	Jose Ivan Vargas	2017-01-03	1	-7/+7
\| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	view (removed an extra tag )
* \| \| \| \| \|	Merge branch 'master' into auto-pipelines-vue	Regis	2017-01-04	1	-15/+45
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Properly handle failed reCAPTCHA on user registration	Drew Blessing	2017-01-03	1	-15/+45
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If a user presses the 'Register' button too quickly after attempting to solve the reCAPTCHA, or the reCAPTCHA is not solved at all, the user would experience a 500 error. Now, the case is properly handled and the user will be sent back to the registration page with a clear error message and can try again.
* \| \| \| \|	fix pipelines/index.html.haml merge conflict	Regis	2017-01-02	5	-3/+140
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Fix redirect after update file when user has forked project	Felipe Artur	2016-12-29	1	-1/+31
\| \| \| \| \|
\| * \| \| \|	applies url_for so that we dont lose filters when redirecting19988-prevent-empty-pagination-when-list-not-empty	Tiago Botelho	2016-12-23	4	-8/+10
\| \| \| \| \|
\| * \| \| \|	adds specs for respective behaviour	Tiago Botelho	2016-12-21	4	-2/+107
\| \| \| \| \|
* \| \| \| \|	merge master and fix application.rb conflict	Regis	2016-12-23	3	-4/+79
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Merge branch '23638-remove-builds-tab' into 'master'	Kamil Trzciński	2016-12-21	1	-4/+0
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Remove Builds tab from Merge Requests and Commits" Closes #23638 See merge request !7763
\| \| * \| \| \|	Removes builds tab from merge request	Filipa Lacerda	2016-12-21	1	-4/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix specs
\| * \| \| \| \|	Merge branch 'zj-mattermost-slash-config' into 'master'	Kamil Trzciński	2016-12-21	1	-0/+58
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mattermost slash auto config Closes #24769 See merge request !8070
\| \| * \| \| \| \|	Add new tests	Z.J. van de Weg	2016-12-21	1	-1/+6
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge branch 'zj-mattermost-slash-config' of gitlab.com:gitlab-org/gitlab-ce ↵	Kamil Trzcinski	2016-12-20	1	-0/+53
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into zj-mattermost-slash-config
\| \| \| * \| \| \| \|	Add controller test	Z.J. van de Weg	2016-12-20	1	-0/+53
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'fix/group-path-rename-error' into 'master'	Douwe Maan	2016-12-21	1	-0/+21
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix error 500 renaming group. Also added specs and changelog. Closes #17922 and #23223 See merge request !8201
\| \| * \| \| \| \| \|	added more specs	James Lopez	2016-12-21	1	-2/+2
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Fix error 500 renaming group. Also added specs and changelog.	James Lopez	2016-12-20	1	-0/+21
\| \| \|/ / / / /
* \| \| \| \| \| \|	Add controller specs for pipeline index API endpoint	Grzegorz Bizon	2016-12-21	1	-1/+21
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \|	Merge branch '19703-direct-link-pipelines' into 'master'	Grzegorz Bizon	2016-12-20	1	-0/+47
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Direct link from pipeline list to builds" ## What does this MR do? - Adds a dropdown with builds in the mini pipeline graph in the pipelines table - Unnest a lot of CSS related with pipelines in order to make it reusable ## Screenshots ![Screen_Shot_2016-12-15_at_14.45.41](/uploads/ca1c61842a422a34383e029d668034b7/Screen_Shot_2016-12-15_at_14.45.41.png) ![Screen_Shot_2016-12-15_at_14.45.49](/uploads/952e3277143639ce4ad111103034faeb/Screen_Shot_2016-12-15_at_14.45.49.png) ![Screen_Shot_2016-12-15_at_14.46.02](/uploads/f7369a124b1c3c0db4194de2cb637ef0/Screen_Shot_2016-12-15_at_14.46.02.png) ![graph_animation](/uploads/9bae036cb5acff499f992a4722943d72/graph_animation.gif) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #25071 Closes #19703 See merge request !8097
\| * \| \| \| \|	Fix stage and pipeline specs and rubocop offenses19703-direct-link-pipelines	Grzegorz Bizon	2016-12-20	1	-9/+10
\| \| \| \| \| \|
\| * \| \| \| \|	Move test for HTML stage endpoint to controller specs	Grzegorz Bizon	2016-12-20	1	-0/+46
\| \|/ / / /
* \| \| \| \|	Merge branch '22348-gitea-importer' into 'master'	Rémy Coutable	2016-12-20	2	-207/+52
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It adds a brand new importer for Gitea! This is a continuation of !6945 started by @bkc. Gitea aims to be 100% GitHub-compatible but there's a few differences: - Gitea is not an OAuth provider (yet): https://github.com/go-gitea/gitea/issues/27 - This means we cannot map Gitea users given an assignee ID => assignees are not set on imported issues and merge requests - No releases API for now: https://github.com/go-gitea/gitea/issues/330 - API version is `v1` (GitHub is `v3`) - The IID field for milestones is `id` compared to `number` in GitHub. - Issues, PRs, milestones, labels don't have a `url` field (the importer now fallback to `''` in that case) Known issues: - Comments are not imported because comments JSON always have a blank `html_url`/`issue_url`/`pull_request_url`, so the IID cannot be extracted and the issuable cannot be found... :( This is tracked in https://github.com/go-gitea/gitea/issues/401, and solved by https://github.com/gogits/gogs/pull/3624 but this needs to be submitted / merged in Gitea. This is noted in the documentation. ## Are there points in the code the reviewer needs to double check? 1. I've made `Import::GiteaController` inherit from `Import::GithubController` since both controllers should be identical in the long-term and their current differences are small. 1. I've added a base `IssuableFormatter` class from which `IssueFormatter` & `PullRequestFormatter` inherit 1. I've added shared examples for GitHub/Gitea importer classes 1. I've made `Gitlab::ImportSources` more robust and tested! :christmas_tree: 1. I've added routing specs for import routes! :christmas_tree: Closes #22348 See merge request !8116
\| * \| \| \| \|	Namespace access token session key in `Import::GithubController`	Rémy Coutable	2016-12-19	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>