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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \|	Fix bug where only the first 15 Bitbucket issues would be imported.	Stan Hu	2015-09-01	1	-0/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also fix a number of issues where author/reporter names were not available.
* \| \| \|	Merge branch 'master' into joelkoglin/gitlab-ce-feature_fix_ldap_auth_issue_993	Douwe Maan	2015-08-29	13	-12/+524
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge branch 'rs-remove-user-color-scheme-class' into 'master'	Douwe Maan	2015-08-27	2	-3/+45
\| \|\ \ \ \| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Apply syntax highlighting to fenced code blocks client-side Instead of applying the syntax highlighting scheme class to these blocks server-side, we use Javascript and Gon to apply the user's color scheme (or the default) client-side. This will make it easier to cache these blocks in the future because they're no longer state-dependent. See merge request !1203
\| \| * \|	Add Gitlab::ColorSchemes module	Robert Speicher	2015-08-25	2	-3/+45
\| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	Very similar to Gitlab::Theme, this contains all of the definitions for our syntax highlighting schemes.
\| * \|	Re-enable the "links with adjacent text" UserReferenceFilter specrs-re-enable-user-reference-spec	Robert Speicher	2015-08-24	1	-1/+0
\| \|/
\| *	Remove user OAuth tokens stored in database for Bitbucket, GitHub, and GitLab	Stan Hu	2015-08-23	3	-6/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and request them each session. Pass these tokens to the project import data. This prevents the need to encrypt these tokens and clear them in case they expire or get revoked. For example, if you deleted and re-created OAuth2 keys for Bitbucket, you would get an Error 500 with no way to recover: ``` Started GET "/import/bitbucket/status" for x.x.x.x at 2015-08-07 05:24:10 +0000 Processing by Import::BitbucketController#status as HTML Completed 500 Internal Server Error in 607ms (ActiveRecord: 2.3ms) NameError (uninitialized constant Import::BitbucketController::Unauthorized): app/controllers/import/bitbucket_controller.rb:77:in `rescue in go_to_bitbucket_for_permissions' app/controllers/import/bitbucket_controller.rb:74:in `go_to_bitbucket_for_permissions' app/controllers/import/bitbucket_controller.rb:86:in `bitbucket_unauthorized' ``` Closes #1871
\| *	Merge branch 'reply-by-email' into 'master'	Robert Speicher	2015-08-22	6	-2/+456
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reply by email Fixes #1360. It's far from done, but _it works_. See merge request !1173
\| \| *	No HTML-only email please	Douwe Maan	2015-08-21	1	-3/+16
\| \| \|
\| \| *	Block blocked users from replying to threads by email.reply-by-email	Douwe Maan	2015-08-21	1	-0/+10
\| \| \|
\| \| *	Add stub_reply_by_email_setting helper.	Douwe Maan	2015-08-20	2	-8/+7
\| \| \|
\| \| *	Use heredocs.	Douwe Maan	2015-08-20	1	-95/+107
\| \| \|
\| \| *	Add fixture_file helper.	Douwe Maan	2015-08-20	5	-21/+3
\| \| \|
\| \| *	Removed unused fixtures.	Douwe Maan	2015-08-20	1	-1/+1
\| \| \|
\| \| *	Merge branch 'master' into reply-by-email	Douwe Maan	2015-08-20	3	-238/+4
\| \| \|\
\| \| * \|	Test Gitlab::Email::Receiver.	Douwe Maan	2015-08-20	1	-0/+135
\| \| \| \|
\| \| * \|	Test Email::AttachmentUploader.	Douwe Maan	2015-08-20	2	-1/+27
\| \| \| \|
\| \| * \|	Extract ReplyParser and AttachmentUploader from Receiver.	Douwe Maan	2015-08-20	2	-481/+191
\| \| \| \|
\| \| * \|	Start on tests.	Douwe Maan	2015-08-19	1	-0/+481
\| \| \| \|
\| \| * \|	Test Gitlab::ReplyByEmail.	Douwe Maan	2015-08-19	1	-0/+86
\| \| \| \|
\| * \| \|	Remove trailing HTML entities from non-Rinku autolinks as well.rs-dev-issue-2550	Robert Speicher	2015-08-20	1	-0/+10
\| \| \|/ \| \|/\|
* \| \|	Issue #993: Fixed login failure when extern_uid changes	Joel Koglin	2015-08-21	1	-0/+22
\|/ /
* \|	Merge branch 'remove-satellites'	Dmitriy Zaporozhets	2015-08-19	3	-238/+4
\|\ \ \| \|/ \|/\| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| *	Merge branch 'master' into remove-satellites	Dmitriy Zaporozhets	2015-08-17	1	-1/+1
\| \|\ \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Revert "Merge branch 'revert-satellites' into 'master' "	Dmitriy Zaporozhets	2015-08-11	3	-224/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa, reversing changes made to 2f706fbd231cabe7a76a5d17ac44285aaaf8592c.
* \| \|	Merge branch 'fix-authhash-infinite-loop' into 'master'	Robert Speicher	2015-08-18	1	-4/+0
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix infinite loop when SAML was incorrectly configured. See merge request !1170
\| * \| \|	Fix infinite loop when SAML was incorrectly configured.fix-authhash-infinite-loop	Douwe Maan	2015-08-17	1	-4/+0
\| \| \|/ \| \|/\|
* \| \|	Merge branch 'mr-source-branch-clear-cache' into 'master'	Dmitriy Zaporozhets	2015-08-18	1	-0/+14
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clear cache to prevent listing deleted branches after MR removes source branch Closes #2272 See merge request !1160
\| * \| \|	Clear cache to prevent listing deleted branches after MR removes source branch	Stan Hu	2015-08-14	1	-0/+14
\| \|/ / \| \| \| \| \| \| \| \| \|	Closes #2272
* \| \|	Merge branch 'fix-backslashes-inline-diff' into 'master'	Douwe Maan	2015-08-17	1	-0/+39
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug where backslashes in inline diffs could be dropped This MR fixes a bug in inline diff generation causing backslashes to be dropped. For example, the input: ``` input.to_s.sub(/[\r\n].+/,'').sub(/\\[rn].+/, '').strip ``` The second backslash is dropped in the second `sub` statement: ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/16e513894f7ecda1b111fe7d43e7f388/image.png) With this fix, it looks like: ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/90fd635a937a68f1b2403740ebc75e3a/image.png) Closes #2253 See merge request !1143
\| * \|	Fix bug where backslashes in inline diffs could be dropped	Stan Hu	2015-08-11	1	-0/+39
\| \|/ \| \| \| \| \| \|	Closes #2253
* \|	markup_helper: detect .mkd and .mkdn as markdown	Ben Boeckel	2015-08-12	1	-1/+1
\|/
*	Revert "Merge branch 'drop-satellites'"	Dmitriy Zaporozhets	2015-08-11	3	-4/+224
\| \| \| \| \| \| \|	This reverts commit 957e849f41d96fa9778fcdd06792d2f0274b29ab, reversing changes made to 6b9dbe9f5a175a8162abf296367f561bab3eea1a. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Merge branch 'rs-reference-data-attrs' into 'master'	Robert Speicher	2015-08-10	7	-0/+64
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Add `data-[type]-id` attribute to reference links This is to let us redact them later in another filter. See merge request !1110
\| *	Add `data-[type]-id` attribute to reference linksrs-reference-data-attrs	Robert Speicher	2015-08-08	7	-0/+64
\| \| \| \| \| \| \| \|	This is to let us redact them later in another filter.
* \|	Add `Group#add_*` convenience methodsrs-group-convenience-methods	Robert Speicher	2015-08-07	1	-1/+1
\|/ \| \| \|	Encapsulates the logic for `Gitlab::Access::WHATEVER` levels.
*	Merge branch 'fix-branch-errors-with-encoded-slashes' into 'master'	Douwe Maan	2015-08-06	1	-0/+10
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix errors deleting, creating, and viewing graphs using branches with encoded slashes * Closes #1804 * Closes #1359 See merge request !1084
\| *	Fix "Network" and "Graphs" pages for branches with encoded slashes	Stan Hu	2015-08-02	1	-0/+10
\| \| \| \| \| \| \| \|	Closes #1359
* \|	Merge branch 'drop-satellites'	Dmitriy Zaporozhets	2015-08-05	3	-224/+4
\|\ \
\| * \|	Improve tests to use real branches in merge requests	Dmitriy Zaporozhets	2015-08-04	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Merge branch 'master' into drop-satellites	Dmitriy Zaporozhets	2015-08-04	2	-0/+17
\| \|\ \ \| \| \|/ \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Remove satellites	Dmitriy Zaporozhets	2015-07-15	2	-220/+0
\| \| \|
* \| \|	Revert "Update noteable after a new note is added"revert_touch	Valery Sizov	2015-08-05	1	-4/+0
\| \|/ \|/\| \| \| \| \|	This reverts commit fbdaf0e2a517660c0e4e3960f20b2d3568c33e78.
* \|	Add spec to RelativeLinkFilter for Unicode filenames	Robert Speicher	2015-07-30	1	-0/+16
\| \|
* \|	GoogleCode importer: Do not care about casing of image file extensions	Sven Strickroth	2015-07-20	1	-0/+1
\|/ \| \| \|	Signed-off-by: Sven Strickroth <email@cs-ware.de>
*	Extract the longest-matching ref from a commit path when multiple matches occur	Stan Hu	2015-07-01	1	-2/+9
\| \| \| \|	Closes #1839
*	Merge branch 'master' into rubocop-for-tests	Dmitriy Zaporozhets	2015-06-23	15	-103/+145
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: spec/features/issues_spec.rb spec/models/forked_project_link_spec.rb spec/models/hooks/service_hook_spec.rb spec/models/hooks/web_hook_spec.rb spec/models/project_services/hipchat_service_spec.rb spec/requests/api/project_members_spec.rb spec/requests/api/projects_spec.rb spec/requests/api/system_hooks_spec.rb spec/services/archive_repository_service_spec.rb spec/support/matchers.rb spec/tasks/gitlab/backup_rake_spec.rb
\| *	Fix Gitlab::OAuth::User specrs-rspec3	Robert Speicher	2015-06-22	1	-37/+48
\| \|
\| *	Change `to_not` calls to `not_to`	Robert Speicher	2015-06-22	5	-10/+10
\| \| \| \| \| \| \| \|	Both work, but now we're consistent across the entire app.
\| *	Fix `raise_error` without an argument deprecation warnings	Robert Speicher	2015-06-22	3	-4/+4
\| \|
\| *	Update mock and stub syntax for specs	Robert Speicher	2015-06-22	8	-53/+84
\| \|