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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Updated tests for deploy keysproject-deploy-keys-ui	Phil Hughes	2016-04-25	2	-8/+7
\|
*	Merge branch 'top-navigation-concept' into 'master'	Dmitriy Zaporozhets	2016-04-21	1	-0/+4
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement top navigation for profile area Main idea is to keep left sidebar static so user is not confused by changing context. Instead we put changing navigation with changing content in one main block. I used profile area as a simplest way to implement and test this concept. Your feedback is welcome in comments For https://gitlab.com/gitlab-org/gitlab-ce/issues/14354#note_4878536 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !3824
\| *	Fix tests and remove counters	Dmitriy Zaporozhets	2016-04-19	1	-0/+4
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Merge branch 'ci-commit-as-pipeline' into 'master'	Kamil Trzciński	2016-04-21	3	-5/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ci::Commit becomes a Pipeline object 1. Ci::Commit receives context: ref, :tag. 1. One Ci::Commit describes a one Pipeline 1. Pipeline is created from `.gitlab-ci.yml` 1. Pipeline is a ordered group of builds 1. We test MR against Pipeline 1. Pipelines have a separate view (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703) 1. Pipeline can be triggered from UI (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703) 1. Later we change `Trigger -> TriggerRequest -> Build` to `Trigger -> Pipeline` (future) 1. We add a Pipeline Hook that will be triggered on Pipeline status change (future) 1. We extend notifications to use `Pipeline Hook` to send summary on pipeline changes (future) After merging that I'll prepare a separate MR that will unify naming, database columns, table names: ``` Ci::Commit -> Pipeline Ci::Build -> Build CommitStatus -> Job GenericCommitStatus -> ExternalJob ci_commits -> pipelines ci_builds -> jobs ``` This MR implements first 5 points. This is made to solve this issue https://gitlab.com/gitlab-org/gitlab-ce/issues/14149. See merge request !3653
\| * \	Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineci-commit-as-pipeline	Kamil Trzcinski	2016-04-19	1	-1/+1
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| * \| \|	Fix tests	Kamil Trzcinski	2016-04-18	1	-1/+1
\| \| \| \|
\| * \| \|	Merge remote-tracking branch 'origin/master' into ci-commit-as-pipeline	Kamil Trzcinski	2016-04-16	5	-8/+11
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| * \| \| \|	Support skipped status	Kamil Trzcinski	2016-04-13	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Merge remote-tracking branch 'origin/master' into ci-commit-as-pipeline	Kamil Trzcinski	2016-04-13	2	-0/+16
\| \|\ \ \ \
\| * \| \| \| \|	Fix rubocop	Kamil Trzcinski	2016-04-12	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Fix rest of rspec and spinach tests	Kamil Trzcinski	2016-04-12	2	-4/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Merge remote-tracking branch 'origin/master' into ci-commit-as-pipeline	Kamil Trzcinski	2016-04-11	5	-15/+24
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/views/projects/commits/_commit.html.haml
\| * \| \| \| \| \|	Fix specs	Kamil Trzcinski	2016-04-11	2	-2/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'multi-filter-labels' into 'master'	Jacob Schatz	2016-04-20	2	-0/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mutliple label filter Fixes #989 See merge request !3438
\| * \| \| \| \| \| \|	fix failing tests	Arinde Eniola	2016-04-14	2	-0/+5
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'license-templates-and-api-12804' into 'master'	Robert Speicher	2016-04-20	2	-15/+2
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	License templates when creating/editing a LICENSE file Closes #12804 See merge request !3660
\| * \| \| \| \| \| \|	Fix specs	Rémy Coutable	2016-04-18	2	-15/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \|	Fix features specs (hopefully)	Rémy Coutable	2016-04-18	1	-1/+1
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	Merge branch 'mr-formatting' into 'master'	Robert Speicher	2016-04-19	2	-6/+6
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	use ! rather than # for merge request references Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15278 See merge request !3740
\| * \| \| \| \| \| \|	format merge request references properly	Ben Bodenmiller	2016-04-18	2	-6/+6
\| \|/ / / / / /
* \| \| \| \| \| \|	Remove persistent XSS vulnerability in `commit_person_link` helper	Robert Speicher	2016-04-17	1	-1/+2
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Because we were incorrectly supplying the tooltip title as `data-original-title` (which Bootstrap's Tooltip JS automatically applies based on the `title` attribute; we should never be setting it directly), the value was being passed through as-is. Instead, we should be supplying the normal `title` attribute and letting Rails escape the value, which also negates the need for us to call `sanitize` on it. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15126
* \| \| \| \| \|	Fixed tests	Phil Hughes	2016-04-16	1	-1/+1
\| \|_\|_\|_\|/ \|/\| \| \| \|
* \| \| \| \|	Merge branch '14176-diff-paste-data' into 'master'	Jacob Schatz	2016-04-14	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Copying and pasting doesn't grab line numbers or +/- Fixes #14176 See merge request !3687
\| * \| \| \| \|	Update click_diff_line	Annabel Dunstone	2016-04-14	1	-1/+1
\| \|/ / / /
* \| \| \| \|	Merge branch 'subscribe-button-fix' into 'master'	Jacob Schatz	2016-04-14	3	-5/+5
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed references to subscribe-button CSS class These were being blocked by adblocks Closes #15043 See merge request !3677
\| * \| \| \|	Removed references to subscribe-button CSS class	Phil Hughes	2016-04-12	3	-5/+5
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These were being blocked by adblocks Closes #15043
* \| \| \|	Load related MRs/branches asynchronously	Yorick Peterse	2016-04-13	1	-2/+5
\| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently this works by loading the HAML partials via XHR. While this is not the nicest setup it _is_ the easiest setup using the tools we currently have. Loading this data asynchronously doesn't make loading the related MRs/branches itself faster, it merely ensures that loading the issue itself is not slowed down. Fixes gitlab-org/gitlab-ce#14949
* \| \|	Merge branch 'master' into decouple-member-notification	Douglas Barbosa Alexandre	2016-04-11	7	-17/+26
\|\ \ \ \| \|/ /
\| * \|	Merge branch 'mr-ui-update' into 'master'	Jacob Schatz	2016-04-11	5	-15/+24
\| \|\ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated UI for new merge request Closes #2540 ![Screen_Shot_2016-03-29_at_12.53.18](/uploads/426e603675171f0dc4e0af83c7762eba/Screen_Shot_2016-03-29_at_12.53.18.png) ![Screen_Shot_2016-03-29_at_12.53.13](/uploads/645ad7955acfb9f7693245fcc048ee49/Screen_Shot_2016-03-29_at_12.53.13.png) See merge request !3228
\| \| *	Addressed feedback	Phil Hughes	2016-04-11	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \|	Removed important from css
\| \| *	Fixed tests	Phil Hughes	2016-04-07	1	-1/+1
\| \| \|
\| \| *	Fixed builds	Phil Hughes	2016-04-06	4	-11/+21
\| \| \|
\| \| *	Use new dropdowns for MR compare	Phil Hughes	2016-04-06	1	-2/+2
\| \| \|
\| \| *	Fixed failing tests	Phil Hughes	2016-04-06	1	-2/+2
\| \| \|
\| * \|	Merge branch 'redesign_labels_page' into 'master'	Jacob Schatz	2016-04-10	1	-1/+1
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Redesign labels page closes #14227 ## Desktop ![Screen_Shot_2016-04-05_at_7.19.37_PM](/uploads/a52b764565b6e2739fb6932178f8bde5/Screen_Shot_2016-04-05_at_7.19.37_PM.png) ## Mobile ![Screen_Shot_2016-04-04_at_6.40.57_PM](/uploads/9804b074126fcdb6755918e9f4c472a7/Screen_Shot_2016-04-04_at_6.40.57_PM.png) See merge request !3507
\| \| * \|	fix the failing tests and some changes	Arinde Eniola	2016-04-06	1	-1/+1
\| \| \|/
\| * \|	Diff touch ups	Annabel Dunstone	2016-04-07	1	-0/+1
\| \| \|
\| * \|	Diff design updates	Annabel Dunstone	2016-04-07	2	-6/+5
\| \| \|
\| * \|	Update diff_comments tests	Annabel Dunstone	2016-04-07	2	-5/+5
\| \| \|
* \| \|	Merge branch 'master' into decouple-member-notification	Douglas Barbosa Alexandre	2016-04-08	9	-14/+55
\|\ \ \ \| \|/ /
\| * \|	Revert "Merge branch 'new-navigation-prototype' into 'master'"	Jacob Schatz	2016-04-07	8	-11/+30
\| \| \| \| \| \| \| \| \|	This reverts merge request !3494
\| * \|	Update number of Todos in the sidebar when it's marked as "Done"	Douglas Barbosa Alexandre	2016-04-07	1	-0/+2
\| \|/
\| *	Merge branch 'note-form-design' into 'master'	Jacob Schatz	2016-04-05	2	-4/+4
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Notes form design update Part of #3401 See merge request !3442
\| \| *	Updated tests	Phil Hughes	2016-04-04	1	-1/+1
\| \| \|
\| \| *	Commits comment test update	Phil Hughes	2016-04-04	1	-1/+1
\| \| \|
\| \| *	Tests update	Phil Hughes	2016-04-04	1	-2/+2
\| \| \|
\| * \|	Wrap images in discussions and wikis with a link to the image source using ↵	connorshea	2016-04-04	1	-1/+1
\| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ImageLinkFilter. Resolves #14411. See merge request !3464
\| *	Merge branch 'issue_14853' into 'master'	Yorick Peterse	2016-04-04	2	-0/+27
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug related to filtering Issues by Label/Milestone. See merge request !3499
\| \| *	Fix bug related to filtering Issues by Label/Milestone.issue_14853	Rubén Dávila	2016-04-02	2	-0/+27
\| \| \| \| \| \| \| \| \| \| \| \|	This problem only was affecting the dev env.
\| * \|	Merge branch 'new-navigation-prototype' into 'master'	Dmitriy Zaporozhets	2016-04-02	8	-30/+11
\| \|\ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Two level hierarchy in navigation sidebar Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !3494