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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \|	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Dmitriy Zaporozhets	2015-05-13	10	-221/+275
\|\ \ \ \ \ \ \
\| * \ \ \ \ \ \	Merge pull request #9276 from jirutka/relative_link_filter	Dmitriy Zaporozhets	2015-05-13	6	-218/+242
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extract handling of relative file links to its own HTML filter
\| \| * \| \| \| \| \| \|	Add spec for RelativeLinkFilter	Jakub Jirutka	2015-05-12	2	-73/+120
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	RelativeLinkFilter: refactor according to suggestions by @tsigo	Jakub Jirutka	2015-05-11	2	-17/+13
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Extract handling of relative file links to RelativeLinkFilter	Jakub Jirutka	2015-05-11	4	-145/+126
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge pull request #8872 from baloo/feature/execute_mr_webhooks_upon_commit	Jeroen van Baarsen	2015-05-13	4	-3/+33
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \|	Call merge request web hook for each commits
\| \| * \| \| \| \| \| \|	Call merge request web hook for each commits	Arthur Gautier	2015-05-13	4	-3/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Call merge request web hook every times a new commit hits the source branch Signed-off-by: Arthur Gautier <baloo@gandi.net>
* \| \| \| \| \| \| \| \|	Merge branch 'version-check' into 'master'	Dmitriy Zaporozhets	2015-05-13	9	-10/+46
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Version check See merge request !1509
\| * \| \| \| \| \| \| \|	Enable version check only for production environment	Dmitriy Zaporozhets	2015-05-11	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \|	Replace host with real one	Dmitriy Zaporozhets	2015-05-11	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \|	Fix syntax error	Dmitriy Zaporozhets	2015-05-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \|	Merge branch 'version-check' into gl-version-check	Dmitriy Zaporozhets	2015-05-08	9	-10/+45
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/controllers/admin/application_settings_controller.rb app/views/admin/application_settings/_form.html.haml db/schema.rb
\| \| * \| \| \| \| \| \|	Remove unnecessary public key	Dmitriy Zaporozhets	2015-05-08	2	-9/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \| \| \| \|	Remove encryption	Dmitriy Zaporozhets	2015-05-08	4	-24/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \| \| \| \|	Add feature to disable version check	Dmitriy Zaporozhets	2015-03-10	6	-5/+20
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Add version check to help page too	Dmitriy Zaporozhets	2015-03-09	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Prevent crash if file does not exists	Dmitriy Zaporozhets	2015-03-09	1	-1/+3
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Add version check badge to admin area	Dmitriy Zaporozhets	2015-03-09	3	-1/+40
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Add simple_encrypt gem	Dmitriy Zaporozhets	2015-03-09	2	-0/+3
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	Dmitriy Zaporozhets	2015-05-13	1	-5/+0
\|\ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Merge branch 'code-defreeze' into 'master'	Marin Jankovski	2015-05-13	1	-5/+0
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	defreeze code Fixes #2166. See merge request !1820
\| \| * \| \| \| \| \| \| \| \|	defreeze code	Job van der Voort	2015-05-11	1	-5/+0
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Marin Jankovski	2015-05-13	7	-4/+57
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|/ / / / \| \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-05-12	7	-4/+57
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| / / / / / / / / / \| \|/ / / / / / / / /
\| * \| \| \| \| \| \| \| \|	Merge branch 'fix-avatar-removal' into 'master'	Hannes Rosenögger	2015-05-12	7	-4/+57
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug where avatar filenames were not actually deleted from the database during removal This would result in a 404 error in certain views. The `save` call was being rolled back due to an error in the validation step. Relax the validation step so that this works. Closes #1570 See merge request !620
\| \| * \| \| \| \| \| \| \|	Fix bug where avatar filenames were not actually deleted from the database ↵	Stan Hu	2015-05-07	7	-5/+57
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	during removal. This would result in a 404 error in certain views. The `save` call was being rolled back due to an error in the validation step. Relax the validation step so that this works. Closes #1570
* \| \| \| \| \| \| \| \| \|	Merge branch 'remove-outdated-gif' into 'master'	Sytse Sijbrandij	2015-05-12	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace outdated gif in README with link to website Fixes #2298 See merge request !1806
\| * \| \| \| \| \| \| \| \|	Replace outdated gif in README with link to website	Dmitriy Zaporozhets	2015-05-06	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'ad-block_auto_created_users' into 'master'	Dmitriy Zaporozhets	2015-05-12	3	-5/+25
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't accidentally unblock auto created users from Active Directory. Fixes #1581. See merge request !638
\| * \| \| \| \| \| \| \| \| \|	Don't accidentally unblock auto created users from Active Directory.ad-block_auto_created_users	Douwe Maan	2015-05-12	3	-5/+25
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-05-12	1	-51/+4
\|\ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \	Merge branch 'remove-mysql-index-conversion-from-docs' into 'master'	Douwe Maan	2015-05-12	1	-51/+4
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update docs in line with mysql-postgresql-converter changes. See merge request !640
\| \| * \| \| \| \| \| \| \| \| \| \|	Update docs in line with mysql-postgresql-converter changes.remove-mysql-index-conversion-from-docs	Douwe Maan	2015-05-12	1	-51/+4
\| \|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'migration_style_guide' into 'master'	Sytse Sijbrandij	2015-05-12	1	-1/+47
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update migration style guide See merge request !1823
\| * \| \| \| \| \| \| \| \| \| \|	update migration style guide	Valery Sizov	2015-05-12	1	-1/+47
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'note-role' into 'master'	Dmitriy Zaporozhets	2015-05-12	3	-9/+29
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show user roles by comments. I think it would be useful to show the user's role (Owner/Master/Developer/Reporter) by comments on GitLab.com (like GitHub does with Owner/Collaborator). That way people will know that when someone from the project's core team comments, they're not just some random user, but they're actually on the team. Currently they have the gather this from context. ![Screen_Shot_2015-05-12_at_12.15.45](https://gitlab.com/gitlab-org/gitlab-ce/uploads/0da0eea2087d6d3b14a2c0c594575c8a/Screen_Shot_2015-05-12_at_12.15.45.png) On hover, the note actions replace the role: ![Screen_Shot_2015-05-12_at_12.17.32](https://gitlab.com/gitlab-org/gitlab-ce/uploads/54a83c2f5047ea3ce0387f6692b14fe5/Screen_Shot_2015-05-12_at_12.17.32.png) --- Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2321. cc @sytses See merge request !639
\| * \| \| \| \| \| \| \| \| \| \| \|	Show user roles by comments.	Douwe Maan	2015-05-12	3	-9/+29
\| \| \|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Fix Gemfile.lock	Dmitriy Zaporozhets	2015-05-12	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'rs-system-note' into 'master'	Dmitriy Zaporozhets	2015-05-12	13	-729/+754
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add SystemNoteService class The Note model was basically two models crammed together - one handling user-created notes (i.e., comments on things) and one handling system-created notes (i.e., references). This splits out the system-specific stuff to a new SystemNoteService class. See merge request !595
\| * \| \| \| \| \| \| \| \| \| \| \|	Reorganize SystemNoteService spec a bitrs-system-note	Robert Speicher	2015-05-11	1	-13/+17
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Refactor SystemNoteService.cross_reference_disallowed?	Robert Speicher	2015-05-11	1	-6/+13
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Spec SystemNoteService.cross_reference_disallowed?	Robert Speicher	2015-05-11	1	-2/+26
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Simplify Note model specs	Robert Speicher	2015-05-11	2	-215/+36
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Check if `system` is truthy in `Note.cross_reference?`	Robert Speicher	2015-05-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Update SystemNoteService method naming conventions	Robert Speicher	2015-05-11	7	-205/+202
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now the verb comes first, and there is no restriction on singular/plural.
\| * \| \| \| \| \| \| \| \| \| \| \|	Remove legacy special case for emphasized reference notes	Robert Speicher	2015-05-11	2	-49/+9
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Add migration to convert legacy system notes	Robert Speicher	2015-05-11	2	-1/+17
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Add a SystemNoteService class	Robert Speicher	2015-05-11	11	-479/+683
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There's a lot of code in the Note model that only deals with creating system notes, so we're going to split that into its own class.
\| * \| \| \| \| \| \| \| \| \| \| \|	Simplify `Note#upvote?` and `Note#downvote?`	Robert Speicher	2015-05-10	1	-17/+11
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Note's voting specs don't need to persist to the database	Robert Speicher	2015-05-10	1	-18/+16
\| \| \|_\|_\|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \|