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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \| \|	Small css improvements	Dmitriy Zaporozhets	2015-05-19	3	-2/+7
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'jirutka-shell-secret-path'	Marin Jankovski	2015-05-19	6	-6/+14
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Move the changelog item to 7.12	Marin Jankovski	2015-05-19	1	-1/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'shell-secret-path' of https://github.com/jirutka/gitlabhq into ↵	Marin Jankovski	2015-05-19	6	-6/+12
\| \|\ \ \ \ \ \ \ \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	jirutka-shell-secret-path
\| * \| \| \| \| \| \|	Allow to configure gitlab_shell_secret location	Jakub Jirutka	2015-05-16	6	-6/+12
\| \| \|_\|/ / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #9289 from jirutka/asciidoc-2	Robert Speicher	2015-05-18	10	-49/+35
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor, simplify and unify helpers for rendering markup
\| * \| \| \| \| \| \|	Simplify and unify helpers for rendering markup	Jakub Jirutka	2015-05-18	8	-34/+20
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Rename MarkdownHelper to MarkupHelper	Jakub Jirutka	2015-05-18	5	-15/+15
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #9288 from jirutka/asciidoc	Robert Speicher	2015-05-18	12	-9/+189
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve AsciiDoc rendering See https://github.com/gitlabhq/gitlabhq/pull/9288
\| * \| \| \| \| \| \|	Add changelog items for #9288	Jakub Jirutka	2015-05-18	1	-0/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Handle AsciiDoc better, reuse HTML pipeline filters (fixes #9263)	Jakub Jirutka	2015-05-18	9	-6/+184
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Update asciidoctor gem to the latest version	Jakub Jirutka	2015-05-18	2	-3/+3
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-05-18	18	-35/+140
\|\ \ \ \ \ \ \
\| * \ \ \ \ \ \	Merge branch 'rs-issue-1626' into 'master'	Dmitriy Zaporozhets	2015-05-18	3	-3/+3
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix labels for project/snippet visibility selection Closes #1626 See merge request !671
\| \| * \| \| \| \| \| \|	Increase left margin for visibility descriptionsrs-issue-1626	Robert Speicher	2015-05-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now they line up with their title.
\| \| * \| \| \| \| \| \|	Fix labels for project/snippet visibility selection	Robert Speicher	2015-05-16	2	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'rs-default-tooltip-placement' into 'master'	Dmitriy Zaporozhets	2015-05-18	1	-2/+2
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix default tooltip placement Made a logic error in 1e1785cc that prevented elements with the `has_tooltip` class from having the default tooltip placement if they didn't define one. See merge request !674
\| \| * \| \| \| \| \| \| \|	Fix default tooltip placementrs-default-tooltip-placement	Robert Speicher	2015-05-17	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'search-issues-by-number' into 'master'	Douwe Maan	2015-05-18	4	-5/+33
\| \|\ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add search issues/MR by number It allows user to search issues/MR by number, e.g. `#3`. Solves this [request](http://feedback.gitlab.com/forums/176466-general/suggestions/4235923-search-issues-by-number). See merge request !668
\| \| * \| \| \| \| \| \| \|	Add search issues/MR by number	Nikita Verkhovin	2015-05-18	4	-5/+33
\| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	Merge branch 'rs-reversible-migrations' into 'master'	Robert Speicher	2015-05-16	3	-3/+22
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make more migrations reversible See merge request !646
\| \| * \| \| \| \| \| \|	Make more migrations reversiblers-reversable-migrations	Robert Speicher	2015-05-13	3	-3/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \|	Merge branch 'unauthorized-participants' into 'master'	Dmitriy Zaporozhets	2015-05-16	6	-22/+42
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't send notifications to mentioned users that don't have access to the project in question. Fixes internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2325. See merge request !664
\| \| * \| \| \| \| \| \| \|	Fix specs.unauthorized-participants	Douwe Maan	2015-05-15	3	-7/+12
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Fix.	Douwe Maan	2015-05-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Don't include users without project access in participants.	Douwe Maan	2015-05-15	2	-7/+15
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Move stuff around a bit in NotifictionService.	Douwe Maan	2015-05-15	1	-8/+15
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'fix-docker-single-postgresql-startup' into 'master'	Sytse Sijbrandij	2015-05-15	2	-0/+38
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set gitlab.rb in Docker single image to make PostgreSQL start up properly See gitlab-org/omnibus-gitlab#552 See merge request !661
\| \| * \| \| \| \| \| \| \|	Set gitlab.rb in Docker single image in order to make PostgreSQL start up ↵	Stan Hu	2015-05-15	2	-0/+38
\| \| \| \|_\|_\|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	properly See gitlab-org/omnibus-gitlab#552
* \| \| \| \| \| \| \| \|	Merge branch 'test-db-dump' into 'master'	Job van der Voort	2015-05-18	2	-0/+46
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	How to dump a production DB to staging See merge request !1825
\| * \| \| \| \| \| \| \| \|	How to dump a production DB to staging	Jacob Vosmaer	2015-05-18	2	-0/+46
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'improve-reset-tokens' into 'master'	Dmitriy Zaporozhets	2015-05-18	8	-33/+119
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Explain reset token expiration in emails Update the new user emails to tell new users when their password reset token expires and provide a link to get a new one. See #1921. This MR adds new text to the emails: ```html This link is valid for X days. After it expires, you can <a href='new_user_password_url'>request a new one</a> ``` It will be more difficult to add the same link to the error message that's displayed when a user tries to reset his password with an expired token. Currently, we don't know why the password change fails, we just show the Devise error messages on the form. See merge request !1803
\| * \| \| \| \| \| \| \|	Add tests for password reset token changes	Vinnie Okada	2015-05-16	1	-33/+24
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fill in email on the new password form	Vinnie Okada	2015-05-16	4	-4/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Redirect if password reset token is expired	Vinnie Okada	2015-05-16	1	-0/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't display the password editing form if the user's token is expired; redirect to the form that allows users to request a new password reset token.
\| * \| \| \| \| \| \| \|	Explain reset token expiration in emails	Vinnie Okada	2015-05-16	6	-0/+75
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Tell new users when their password reset token expires and provide a link to get a new one.
* \| \| \| \| \| \| \|	Merge branch 'attr_encryped_no_db_connection' into 'master'	Dmitriy Zaporozhets	2015-05-15	1	-0/+20
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't require DB connection in AttrEncrypted. See merge request !667
\| * \| \| \| \| \| \| \|	Fix.	Douwe Maan	2015-05-15	1	-13/+5
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Improve fix.attr_encryped_no_db_connection	Douwe Maan	2015-05-15	1	-13/+12
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Don't require DB conncetion in AttrEncrypted.	Douwe Maan	2015-05-15	1	-0/+29
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #9277 from jvanbaarsen/pr/9061	Jeroen van Baarsen	2015-05-15	2	-1/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure that the first added admin performs repository imports
\| * \| \| \| \| \| \| \|	Ensure that the first added admin performs repository imports	Fotis Gimian	2015-05-15	2	-1/+2
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '7-11-guides' into 'master'	Job van der Voort	2015-05-15	3	-16/+120
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update installation/update guides for 7.11. See merge request !665
\| * \| \| \| \| \| \|	Update installation/update guides for 7.11.	Douwe Maan	2015-05-15	3	-16/+120
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'fix-653' into 'master'	Dmitriy Zaporozhets	2015-05-15	1	-1/+1
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix push event. Fixes issue with !653. See merge request !663
\| * \| \| \| \| \|	Fix push event.	Douwe Maan	2015-05-15	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-05-15	14	-33/+50
\|\ \ \ \ \ \
\| * \ \ \ \ \	Merge branch 'dashboard-references' into 'master'	Dmitriy Zaporozhets	2015-05-15	11	-22/+30
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix reference links in dashboard activity and ATOM feeds. References like `@user` were not linked on the dashboard activity feed and in Atom feeds, because the reference parser depends on `@project` which isn't set in those situations. This MR passes the project in question to the reference parsers in an option. cc @rspeicher See merge request !653
\| \| * \| \| \| \| \|	Fix reference links in dashboard activity and ATOM feeds.dashboard-references	Douwe Maan	2015-05-14	11	-22/+30
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'spinner-spin' into 'master'	Dmitriy Zaporozhets	2015-05-15	2	-6/+7
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Spin icon next to "Checking for CI status..." Stationary spinners make me sad. See merge request !655