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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add `AbuseReport#notify`rs-abuse-reports-refactor	Robert Speicher	2016-01-04	1	-0/+17
\| \| \| \|	Tell, Don't Ask.
*	Merge branch 'rs-issue-201' into 'master'	Dmitriy Zaporozhets	2016-01-04	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Prevent duplicate "username has already been taken" validation message Closes #201 - two-year-old bug, woo! :boom: :tada: See merge request !2279
\| *	Prevent duplicate "username has already been taken" validation messagers-issue-201	Robert Speicher	2016-01-02	1	-1/+1
\| \| \| \| \| \| \| \|	Closes #201 - two-year-old bug, woo! :boom: :tada:
* \|	remove public field from namespace and refactoringnamespace-clean_up	Valery Sizov	2016-01-04	1	-27/+0
\|/
*	Merge branch 'upvote_count_to_api' into 'master'	Valery Sizov	2015-12-29	1	-0/+14
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Revert upvotes and downvotes params back to MR API issue https://gitlab.com/gitlab-org/gitlab-ce/issues/3672 See merge request !2212
\| *	Revert upvotes and downvotes params to MR API	Valery Sizov	2015-12-28	1	-0/+14
\| \|
* \|	Merge branch 'mention-all' into 'master'	Robert Speicher	2015-12-27	1	-0/+4
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	Only allow group/project members to mention `@all` Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3473 See merge request !2205
\| *	Fix specs	Douwe Maan	2015-12-24	1	-0/+4
\| \|
* \|	Merge branch 'revert_votes_back' into 'master'	Dmitriy Zaporozhets	2015-12-25	1	-3/+8
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert vote buttons back to issue and MR pages https://gitlab.com/gitlab-org/gitlab-ce/issues/3672 /cc @dzaporozhets @JobV ![joxi_screenshot_1450809309400](/uploads/379a75505e0d5f24e743aa0a6a6684e2/joxi_screenshot_1450809309400.png) See merge request !2206
\| * \|	revert back vote buttons to issue and MR pages	Valery Sizov	2015-12-25	1	-3/+8
\| \| \|
* \| \|	Merge branch 'rs-opengraph' into 'master'	Douwe Maan	2015-12-25	1	-0/+18
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Open Graph meta tags See merge request !2192
\| * \|	Satisfy Rubocop	Douwe Maan	2015-12-25	1	-2/+2
\| \| \|
\| * \|	Add support for `twitter:label` meta tagsrs-opengraph	Robert Speicher	2015-12-24	1	-0/+18
\| \| \|
* \| \|	WIP require two factor authentication	Gabriel Mazetto	2015-12-24	1	-0/+1
\| \|/ \|/\|
* \|	Merge branch 'fix-milestones-with-slashes' into 'master'	Dmitriy Zaporozhets	2015-12-24	1	-0/+10
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Error 500 when global milestones have slashes * Closes #4226 * Closes https://github.com/gitlabhq/gitlabhq/issues/9921 See merge request !2182
\| * \|	Fix Error 500 when global milestones have slashes	Stan Hu	2015-12-22	1	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \|	Closes #4226
* \| \|	Merge branch 'fix/visibility-level-setting-in-forked-projects' into 'master'	Douwe Maan	2015-12-24	1	-0/+24
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix/visibility level setting in forked projects Fixes #3136 /cc @DouweM See merge request !1744
\| * \| \|	Add some specs for forked project visibility_level cases	Tomasz Maczukin	2015-12-24	1	-0/+24
\| \| \| \|
* \| \| \|	Merge branch 'emoji-picker-fix' into 'master'	Valery Sizov	2015-12-24	1	-2/+2
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Emoji picker: better alias handling related to https://gitlab.com/gitlab-org/gitlab-ce/issues/3576 See merge request !2198
\| * \| \|	fix specemoji-picker-fix	Valery Sizov	2015-12-24	1	-2/+2
\| \| \|/ \| \|/\|
* \| \|	Add method that persist ensured token in `TokenAuthenticatable`	Grzegorz Bizon	2015-12-23	1	-6/+13
\| \| \|
* \| \|	Fix method that ensures authentication token	Grzegorz Bizon	2015-12-23	1	-0/+4
\|/ / \| \| \| \| \| \| \| \| \| \|	Until now, `ensure_#{token_filed_name}` method didn't persist new token in database. This closes #4235.
* \|	Merge branch 'add_email_unlock' into 'master'	Robert Speicher	2015-12-21	1	-0/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow account unlock via email We see a lot of users get confused about what it means when your account gets locked. Many try to reset their password and are still faced with a lockout. With this change, users receive an email that allows them to unlock their account immediately. The previous behavior where the account is auto-unlocked after a time also still works. See merge request !2049
\| * \|	Allow account unlock via email	Drew Blessing	2015-12-14	1	-0/+1
\| \| \|
* \| \|	Merge branch 'issue_3452'	Douwe Maan	2015-12-21	1	-0/+64
\|\ \ \
\| * \| \|	Fix broken spec. #3452	Rubén Dávila	2015-12-16	1	-1/+1
\| \| \| \|
\| * \| \|	Add link to MR from Build detail page. #3452	Rubén Dávila	2015-12-16	1	-0/+64
\| \| \|/ \| \|/\|
* \| \|	Merge branch 'coverage-regex' into 'master'	Douwe Maan	2015-12-21	1	-0/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix build coverage regex matching to allow captures. Fixes #2644 /cc @DouweM See merge request !2138
\| * \| \|	Fix build coverage regex.	Jared Szechy	2015-12-20	1	-0/+6
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added a spec for regex captures as well. Fixes #2644
* \| \|	Backport JIRA service	Drew Blessing	2015-12-18	4	-5/+167
\|/ /
* \|	Merge branch 'add-open-issues-count-to-api' of ↵	Dmitriy Zaporozhets	2015-12-16	1	-1/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/stanhu/gitlab-ce Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Add open_issues_count to project API	Stan Hu	2015-12-11	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \|	This is needed to support Huboard and a generally useful value.
* \| \|	Fixed Rubocop offenses	Gabriel Mazetto	2015-12-15	5	-21/+19
\| \|/ \|/\|
* \|	Merge branch 'master' into ci/persist-registration-token	Grzegorz Bizon	2015-12-14	19	-908/+234
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (66 commits) Fix runners admin view Fix migrations Rename mention of gitlab-git-http-server to gitlab-workhorse Bump Redis requirement to 2.8 for Sidekiq 4 requirements Fix wording on runner setup page add details on how to change saml button label Fix tests Move awards back to gray panel and few improvements to sidebar Few UI improvements to new sidebar implementation Fix tests for new issuable sidebar Update changelog Implement new sidebar for merge request page Make edit link on issuable sidebar works Redesign issue page for new sidebar Move awards css to separate file Implement issuable sidebar partial Update CHANGELOG Clarify cache behavior Run builds from projects with enabled CI Use Gitlab::Git instead of Ci::Git ... Conflicts: db/schema.rb
\| * \	Merge branch 'ci-project-migrate' into 'master'	Kamil Trzciński	2015-12-14	9	-406/+130
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ci Project migrate - This doesn't migrate: allow_git_fetch, coverage_regex, timeout. Since this are project configuration settings I would propose to migrate them to `.gitlab-ci.yml`. - This requires offline migrations. - It simplifies database models making all CI objects to be attached to: Project. - It removes Ci::Project, but makes /ci/projects working by adding method: Project.find_by_ci_id for backward compatibility (badges, triggers). - We should add default `timeout` to Application Settings. - It misses specs. - It is based on ci-services-migrate for now. - It removes CI events. - It removes administrator CI projects overview. - It removes CI application settings. In 8.4 or 8.5 we can remove redundant tables and columns. See merge request !1987
\| \| * \|	Fix specs	Kamil Trzcinski	2015-12-11	2	-2/+3
\| \| \| \|
\| \| * \|	Fix after column rename	Kamil Trzcinski	2015-12-11	2	-5/+5
\| \| \| \|
\| \| * \|	Remove ci_ prefix from all ci related things	Kamil Trzcinski	2015-12-11	3	-15/+15
\| \| \| \|
\| \| * \|	Add runners token	Kamil Trzcinski	2015-12-11	1	-1/+1
\| \| \| \|
\| \| * \|	Migrate CI::Project to Project	Kamil Trzcinski	2015-12-11	9	-412/+135
\| \| \| \|
\| * \| \|	Merge branch 'ci-services-migrate' into 'master'	Kamil Trzciński	2015-12-14	10	-502/+95
\| \|\ \ \ \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ci Services migrate See merge request !1985
\| \| * \|	Fix specs	Kamil Trzcinski	2015-12-10	1	-1/+1
\| \| \| \|
\| \| * \|	Migrate CI::Services and CI::WebHooks to Services and WebHooks	Kamil Trzcinski	2015-12-10	10	-502/+95
\| \| \| \|
\| * \| \|	emoji aliases problem	Valery Sizov	2015-12-11	1	-0/+9
\| \| \| \|
* \| \| \|	Make sure that token `ensure_*` method always returns a token	Grzegorz Bizon	2015-12-11	1	-1/+8
\| \| \| \|
* \| \| \|	Add specs for `TokenAuthenticatable` concern	Grzegorz Bizon	2015-12-11	1	-0/+50
\|/ / /
* \| \|	Merge branch 'zj/gitlab-ce-copying-file-seen-as-licence'	Douwe Maan	2015-12-11	1	-1/+20
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Merge branch 'master' into copying-file-seen-as-licence	Zeger-Jan van de Weg	2015-12-10	71	-310/+801
\| \|\ \ \| \| \|/
\| * \|	Licence also accepted as license file	Zeger-Jan van de Weg	2015-12-10	1	-1/+10
\| \| \|
\| * \|	Merge branch 'master' into copying-file-seen-as-licence	Zeger-Jan van de Weg	2015-11-11	21	-164/+741
\| \|\ \