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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| \| * \| \| \| \| \| \|	Spin icon next to "Checking for CI status..."spinner-spin	Douwe Maan	2015-05-14	2	-6/+7
\| \| \|/ / / / / /
\| * \| \| \| \| \| \|	Merge branch 'use-count-badges' into 'master'	Dmitriy Zaporozhets	2015-05-15	2	-5/+13
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use count badges with number_with_delimiter helper for issue, commit count See merge request !658
\| \| * \| \| \| \| \| \|	Small refactoring of state_filters_text_for helperuse-count-badges	Dmitriy Zaporozhets	2015-05-14	1	-3/+2
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	append empty space only if count exists	Dmitriy Zaporozhets	2015-05-14	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Use count badges with number_with_delimiter helper for issue, commit count	Dmitriy Zaporozhets	2015-05-14	2	-5/+14
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #9296 from jorgevbo/master	Jeroen van Baarsen	2015-05-15	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|	Fix bug with default timezone en RSS gitlab events
\| * \| \| \| \| \| \| \|	Fix bug with default timezone en RSS gitlab events	Jorge Vasquez	2015-05-14	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Fix gemfile.lock	Dmitriy Zaporozhets	2015-05-15	1	-1/+1
\| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-05-14	8	-12/+54
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'project_api_order' into 'master'	Dmitriy Zaporozhets	2015-05-14	3	-1/+18
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add order option for projects API https://dev.gitlab.org/gitlab/gitlab-ci/issues/222 See merge request !656
\| \| * \| \| \| \| \| \|	update API docproject_api_order	Valery Sizov	2015-05-14	1	-0/+3
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Add order option for projects API	Valery Sizov	2015-05-14	2	-1/+15
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'rs-refactor-2fa' into 'master'	Dmitriy Zaporozhets	2015-05-14	2	-9/+33
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor SessionsController to use a controller concern See merge request !659
\| \| * \| \| \| \| \| \| \|	Refactor SessionsController to use a controller concernrs-refactor-2fa	Robert Speicher	2015-05-14	2	-9/+33
\| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	Merge branch 'fix-blob-path' into 'master'	Douwe Maan	2015-05-14	3	-2/+3
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken view when viewing history of a file that includes a path that used to be another file Requires gitlab_git to v7.1.12 to be tagged and released. Closes #1598 See merge request !651
\| \| * \| \| \| \| \| \|	Fix broken view when viewing history of a file that includes a path that ↵	Stan Hu	2015-05-13	3	-2/+3
\| \| \| \|_\|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	used to be another file Closes #1598
* \| \| \| \| \| \| \|	Merge pull request #9295 from afc163/master	Jeroen van Baarsen	2015-05-14	2	-0/+17
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	Add style for <kbd> element in markdown
\| * \| \| \| \| \| \|	Add style for <kbd> element in markdown	afc163	2015-05-14	2	-0/+17
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #5825
* \| \| \| \| \| \|	Merge branch 'fewer-icons' into 'master'	Dmitriy Zaporozhets	2015-05-14	1	-6/+0
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use slightly fewer icons in project sidebar. ![Screen_Shot_2015-05-14_at_17.01.37](https://gitlab.com/gitlab-org/gitlab-ce/uploads/57928b7a0beb556f1e779d340b5e124f/Screen_Shot_2015-05-14_at_17.01.37.png) See merge request !657
\| * \| \| \| \| \| \|	Use slightly fewer icons in project sidebar.	Douwe Maan	2015-05-14	1	-6/+0
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'rs-relative-link-filter' into 'master'	Dmitriy Zaporozhets	2015-05-14	3	-85/+94
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Minor RelativeLinkFilter cleanup See merge request !649
\| * \| \| \| \| \| \|	Minor RelativeLinkFilter cleanuprs-relative-link-filter	Robert Speicher	2015-05-13	3	-85/+94
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-05-14	6	-32/+33
\|\ \ \ \ \ \ \
\| * \ \ \ \ \ \	Merge branch 'fix-group-mention' into 'master'	Dmitriy Zaporozhets	2015-05-14	3	-3/+4
\| \|\ \ \ \ \ \ \ \| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix mentioning of private groups. `issue.participants` would mistakenly not send the `current_user` to `mentioned_users`, which means it would search for referenced groups and users as if the user was signed out. Since signed out users don't have access to private groups (groups without public projects) and since you can't reference a group you don't have access to (since this would leak its existence), the group reference wasn't found and the group members weren't notified. Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2326. See merge request !654
\| \| * \| \| \| \| \|	Add changelog item.fix-group-mention	Douwe Maan	2015-05-14	1	-0/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Fix mentioning of private groups.	Douwe Maan	2015-05-14	2	-3/+3
\| \| \| \|/ / / / \| \| \|/\| \| \| \|
\| * \| \| \| \| \|	Merge branch 'note-action-icons' into 'master'	Dmitriy Zaporozhets	2015-05-14	3	-29/+29
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Always show note action icons. As discussed in #639. The delete icon becomes red on hover, the edit one becomes slightly darker. The "Link here" icon has been removed, and the link to the specific comment can now be found by clicking the post date ("3 months ago"), which is most other sites do it as well. ![Screen_Shot_2015-05-14_at_12.18.50](https://gitlab.com/gitlab-org/gitlab-ce/uploads/a204fa3a042659fa53fcb70d7143c8d1/Screen_Shot_2015-05-14_at_12.18.50.png) See merge request !652
\| \| * \| \| \| \|	Always show note action icons.	Douwe Maan	2015-05-14	3	-29/+29
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'omniauth-csrf' into 'master'	Dmitriy Zaporozhets	2015-05-14	7	-8/+82
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Protect OmniAuth request phase against CSRF. Addresses #2268. See merge request !1793
\| * \| \| \| \|	Add reset_session for the :reset_session strategy.	Douwe Maan	2015-04-24	1	-1/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Protect OmniAuth request phase against CSRF.	Douwe Maan	2015-04-24	7	-9/+76
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'upgrade-dockerfile-apt' into 'master'	Sytse Sijbrandij	2015-05-14	2	-15/+12
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use apt repositories to upgrade Docker images to the latest versions Reduces the need to bump versions periodically. See merge request !647
\| * \| \| \| \| \|	Use apt repositories to upgrade Docker builds to the latest GitLab version	Stan Hu	2015-05-13	2	-15/+12
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reduces the need to bump versions periodically.
* \| \| \| \| \|	GitLab shell version to 2.6.3.	Marin Jankovski	2015-05-14	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Marin Jankovski	2015-05-14	1	-1/+1
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Merge requests are welcome in spite of the deprecation.	Sytse Sijbrandij	2015-05-13	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'sidekiq-sigkill' into 'master'	Dmitriy Zaporozhets	2015-05-13	2	-1/+2
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use SIGKILL by default in Sidekiq::MemoryKiller This makes the memory growth-triggered Sidekiq restarts more reliable by reducing the chance that Sidekiq ends up in a state where it is not accepting new jobs but also not shutting down: SIGKILL is more likely to work than SIGTERM. See merge request !1824
\| * \| \| \| \|	Use SIGKILL by default in Sidekiq::MemoryKiller	Jacob Vosmaer	2015-05-13	2	-1/+2
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This makes the memory growth-triggered Sidekiq restarts more reliable by reducing the chance that Sidekiq ends up in a state where it is not accepting new jobs but also not shutting down: SIGKILL is more likely to work than SIGTERM.
* \| \| \| \|	Fix text overflow in project sidebar	Dmitriy Zaporozhets	2015-05-13	1	-0/+4
\| \| \| \| \|
* \| \| \| \|	Merge branch 'text-batch-1' into 'master'	Dmitriy Zaporozhets	2015-05-13	14	-84/+98
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Batch 1 of text improvements Batch 1 of changes from my effort at !635 to walk through every piece of text in GitLab and see if it can be improved. This batch includes: - Improve text on error pages. - Improve Git access error messages. - Improve description of branch protection levels. - Improve OAuth signup error message. - Improve OAuth application flash messages. cc @rspeicher See merge request !642
\| * \| \| \| \|	Fix GitAccess.text-batch-1	Douwe Maan	2015-05-13	2	-13/+6
\| \| \| \| \| \|
\| * \| \| \| \|	Fix 422 error page.	Douwe Maan	2015-05-13	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Improve OAuth application flash messages.	Douwe Maan	2015-05-13	1	-5/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Improve OAuth signup error message.	Douwe Maan	2015-05-13	2	-4/+11
\| \| \| \| \| \|
\| * \| \| \| \|	Improve description of branch protection levels.	Douwe Maan	2015-05-13	1	-3/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Improve Git access error messages.	Douwe Maan	2015-05-13	3	-45/+44
\| \| \| \| \| \|
\| * \| \| \| \|	Improve text on error pages.	Douwe Maan	2015-05-13	6	-17/+32
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-05-13	1	-6/+15
\|\ \ \ \ \ \
\| * \| \| \| \| \|	remove strange code branchets	Sytse Sijbrandij	2015-05-13	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Deprecate the upgrader script since we forget to update it.	Sytse Sijbrandij	2015-05-13	1	-5/+14
\| \| \| \| \| \| \|