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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2016-06-20	5	-51/+186
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	feature/runner-lock-on-project * upstream/master: (353 commits) Put some admin settings in dropdown Add styleguide on configuration settings documentation Remove Duplicated keys add UNIQUE index to fingerprint Avoid autoload issue such as 'Mail::Parsers::AddressStruct' Move appearance settings as sub tab to application settings use rails root join fixed a couple of errors spotted in production Fix RangeError exceptions when referring to issues or merge requests outside of max database values Fix bug in `WikiLinkFilter`. Grammar and typographic changes to artifacts documentation Tweak grammar Small frontend code fixes and restore 8a2d88f commit Warn about admin privilege to disable GitHub Webhooks Listing GH Webhooks doesn't stop import process for non GH admin users fixup! updated docs for api endpoint award emoji Update CHANGELOG Ensure Todos counters doesn't count Todos for projects pending delete Add endpoints for award emoji on notes Sort API endpoints and implement feedback Add endpoints for Award Emoji ...
\| *	fixed a couple of errors spotted in production	James Lopez	2016-06-20	1	-1/+1
\| \|
\| *	Merge branch 'issue_12758' into 'master'	Douwe Maan	2016-06-17	1	-35/+81
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement custom notification level options ![Screen_Shot_2016-06-17_at_15.31.43](/uploads/3fc47d2f461b3e8b67bb8acaa304cf99/Screen_Shot_2016-06-17_at_15.31.43.png) ![Screenshot_from_2016-06-15_10-52-27](/uploads/88dbdd21d97e80ee772fe08fa0c9b393/Screenshot_from_2016-06-15_10-52-27.png) part of #12758 See merge request !4389
\| \| *	Merge master into issue_12758issue_12758	Felipe Artur	2016-06-17	6	-61/+101
\| \| \|\
\| \| * \	Re-use notifications dropdown/modal for user profile	Felipe Artur	2016-06-17	1	-6/+26
\| \| \|\ \
\| \| \| * \|	Re-use notifications dropdown on user profile	Felipe Artur	2016-06-16	1	-6/+24
\| \| \| \| \|
\| \| \| * \|	Refactor custom notifications controller code and add specs	Felipe Artur	2016-06-14	1	-1/+2
\| \| \| \| \|
\| \| \| * \|	Remove schema from branch history	Felipe Artur	2016-06-13	1	-0/+5
\| \| \| \| \|
\| \| \| * \|	Improve notification settings event keys and add some specs	Felipe Artur	2016-06-13	1	-29/+33
\| \| \| \| \|
\| \| \| * \|	Implement custom notification level options	Felipe Artur	2016-06-13	1	-22/+38
\| \| \| \| \|
\| \| * \| \|	Implement custom notification level options	Felipe Artur	2016-06-15	1	-34/+60
\| \| \| \| \|
\| * \| \| \|	Merge branch '18034-cache-todo-counter' into 'master'	Yorick Peterse	2016-06-17	1	-1/+11
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cache todo counters (pending/done) See merge request !4438
\| \| * \| \| \|	Cache todo counters (pending/done)18034-cache-todo-counter	Paco Guzman	2016-06-17	1	-1/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- As todos are created/updated inside the TodoService we repopulate the cache just there for both pending/done todos - Todos as mark as done from the TodosController we update cache there too - All the added methods are kept in the User class for cohesion
\| * \| \| \| \|	Fix a 'wrong number of arguments' error	Rémy Coutable	2016-06-17	1	-1/+1
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	Merge branch 'fix-toggling-task-should-not-generate-todo' into 'master'	Robert Speicher	2016-06-17	1	-1/+6
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix error when editing an issuable with a task list Closes #18712 See merge request !4751
\| \| * \| \| \|	Fix error when editing an issuable with a task listfix-toggling-task-should-not-generate-todo	Douglas Barbosa Alexandre	2016-06-17	1	-1/+6
\| \| \| \|_\|/ \| \| \|/\| \|
\| * \| \| \|	Merge branch 'feature/project-export' into 'master'	Douwe Maan	2016-06-17	4	-13/+87
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Export project functionality This is a MR for the export functionality of https://gitlab.com/gitlab-org/gitlab-ce/issues/3050, which adds the ability to export single projects. - [x] members - DB data - [x] issues - [x] issue comments - [x] merge requests - [x] merge request diff - [x] merge request comments - [x] labels - [x] milestones - [x] snippets - [x] releases - [x] events - [x] commit statuses - [x] CI builds - File system data - [x] Git repository - [x] wiki - [x] uploads - [ ] ~~CI build traces~~ - [ ] ~~CI build artifacts~~ - [ ] ~~LFS objects~~ - DB configuration - [x] services - [x] web hooks - [x] protected branches - [x] deploy keys - [x] CI variables - [x] CI triggers See merge request !3114
\| \| * \| \|	fixed merge conflicts on UI branch	James Lopez	2016-06-16	6	-27/+85
\| \| \|\ \ \
\| \| \| * \ \	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵feature/project-export	James Lopez	2016-06-16	6	-27/+85
\| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	feature/project-export # Conflicts: # app/models/ci/pipeline.rb
\| \| \| * \| \| \|	Revert "squashed merge and fixed conflicts"	James Lopez	2016-06-16	6	-85/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 13e37a3ee5c943525a99481b855d654e97e8597c.
\| \| \| * \| \| \|	squashed merge and fixed conflicts	James Lopez	2016-06-16	6	-27/+85
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	lots of refactoring again based on feedback. Changed the UI slightly and ↵	James Lopez	2016-06-15	1	-5/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	also fixed a small bug
\| \| * \| \| \| \|	adapted current services stuff to use new project import, plus fixes a few ↵	James Lopez	2016-06-14	1	-10/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	issues, updated routes, etc...
\| \| * \| \| \| \|	adding notifications stuff and more refactoring for exporting projects	James Lopez	2016-06-14	3	-4/+21
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	lots of refactoring to reuse import service	James Lopez	2016-06-14	2	-3/+8
\| \| \|/ / / /
\| \| * \| \| \|	Merge branches 'feature/project-export' and 'master' of ↵	James Lopez	2016-06-13	15	-45/+102
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	gitlab.com:gitlab-org/gitlab-ce into feature/project-export
\| \| * \| \| \| \|	started refactoring a bunch of stuff based on feedback	James Lopez	2016-06-03	1	-15/+18
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	merge hell	James Lopez	2016-06-03	26	-87/+342
\| \| \|\ \ \ \ \
\| \| * \| \| \| \| \|	Revert "Fix merge conflicts - squashed commit"	James Lopez	2016-06-03	26	-342/+87
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 3e99123095b26988de67a94b0e7a5207c1ef5ae2.
\| \| * \| \| \| \| \|	Fix merge conflicts - squashed commit	James Lopez	2016-06-03	26	-87/+342
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/models/project.rb
\| \| * \| \| \| \| \|	uploads export	James Lopez	2016-05-19	1	-1/+5
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	adding versioning to export	James Lopez	2016-05-16	1	-3/+8
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	fixing more export problems	James Lopez	2016-05-11	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	added better error handling. Also refactored some of the code and fixed a ↵	James Lopez	2016-05-10	1	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	few issues in project_tree_saver
\| \| * \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	James Lopez	2016-05-09	8	-49/+63
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	feature/project-export # Conflicts: # app/models/project.rb
\| \| * \| \| \| \| \| \|	fixed and refactored a few things based on MR feedback	James Lopez	2016-05-06	1	-4/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	update repo and wiki repo bundler to use git bundle instead of compressing ↵	James Lopez	2016-05-05	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	via tar
\| \| * \| \| \| \| \| \|	Merge branches 'feature/project-export' and 'master' of ↵	James Lopez	2016-05-03	6	-3/+53
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	gitlab.com:gitlab-org/gitlab-ce into feature/project-export
\| \| * \| \| \| \| \| \| \|	picking export stuff from the UI branch	James Lopez	2016-05-03	1	-1/+2
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	James Lopez	2016-04-21	21	-135/+250
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	feature/project-export
\| \| * \| \| \| \| \| \| \| \|	refactored stuff, added a save and compress all class and moved mostly ↵	James Lopez	2016-04-14	9	-293/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	everything to lib
\| \| * \| \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	James Lopez	2016-04-12	3	-6/+14
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	feature/project-export
\| \| * \| \| \| \| \| \| \| \| \|	fix export commits stuff	James Lopez	2016-04-12	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	add issue and MR comments to default export. Fix spec	James Lopez	2016-04-12	3	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	fix rubocop warnings	James Lopez	2016-04-08	1	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	using new config	James Lopez	2016-04-07	4	-24/+19
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	continuing to refactor config, added spec and fixed a few problems	James Lopez	2016-04-07	2	-8/+45
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	James Lopez	2016-04-06	34	-139/+510
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	feature/project-export
\| \| * \| \| \| \| \| \| \| \| \| \|	started refactored the dynamic rules to be defined in a yml file	James Lopez	2016-04-06	2	-0/+78
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	fix project snippets json issue	James Lopez	2016-03-14	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \|