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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix php-docker example (for new docker versions)fix/ci-php-docker-example	Tomasz Maczukin	2016-04-25	1	-1/+1
\| \| \| \|	[ci skip]
*	Merge branch 'fix/hidden-build-validation-in-ci-yaml' into 'master'	Rémy Coutable	2016-04-25	3	-64/+122
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add posibility to define a hidden job without 'script' in .gitlab-ci.yml References #15451 /cc @ayufan See merge request !3849
\| *	Move CHANGELOG entry to 8.7.1fix/hidden-build-validation-in-ci-yaml	Tomasz Maczukin	2016-04-22	1	-1/+1
\| \|
\| *	Fix some typos	Tomasz Maczukin	2016-04-22	2	-7/+7
\| \|
\| *	Modify code formatting	Tomasz Maczukin	2016-04-22	1	-3/+1
\| \|
\| *	Update CHANGELOG	Tomasz Maczukin	2016-04-22	1	-0/+1
\| \| \| \| \| \| \| \|	[ci skip]
\| *	Simplify the GitlabCiYamlProcessor#initial_parsing method	Tomasz Maczukin	2016-04-22	1	-16/+11
\| \|
\| *	Fix formatting	Tomasz Maczukin	2016-04-22	1	-3/+3
\| \|
\| *	Add posibility to define a hidden job without 'script' in .gitlab-ci.yml	Tomasz Maczukin	2016-04-22	2	-53/+117
\| \|
* \|	Merge branch 'feature/snumb130/hide-future-blocks-on-graph' into 'master'	Robert Speicher	2016-04-24	4	-3/+8
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hiding future dates on contribution calendar Fixes #9036 See merge request !2628
\| * \|	Updating cal-heatmap-rails gem to 3.6.0 and hiding future dates.	Luke Howell	2016-04-24	4	-3/+8
\| \| \|
* \| \|	Merge branch 'rs-todo-middle-click' into 'master'	Jacob Schatz	2016-04-24	1	-1/+2
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow middle-click on a Todo row to open in a new tab See merge request !3899
\| * \|	Allow middle-click on a Todo row to open in a new tab	Robert Speicher	2016-04-24	1	-1/+2
\|/ /
* \|	Merge branch 'add-tags-to-fetch' into 'master'	Achilleas Pipinellis	2016-04-23	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add --tags to fetching gitlab-shell to ensure tags are downloaded Closes #15525 See merge request !3896
\| * \|	Add --tags to fetching gitlab-shell to ensure tags are downloaded	Stan Hu	2016-04-22	1	-1/+1
\|/ / \| \| \| \| \| \|	Closes #15525
* \|	Merge branch 'upgrade-sidekiq' into 'master'	Robert Speicher	2016-04-22	1	-4/+3
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Sidekiq and related gems (bundle update sidekiq) Closes #15079 See merge request !3817
\| * \|	Update Sidekiq and related gems (bundle update sidekiq)	Stan Hu	2016-04-19	1	-4/+3
\| \| \| \| \| \| \| \| \| \| \| \|	Closes #15079
* \| \|	Merge branch 'rs-update-binstubs' into 'master'	Robert Speicher	2016-04-22	6	-10/+30
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Re-generate Spring binstubs for updated version of Spring Prevents output like this: Array values in the parameter are deprecated. Please use a String or nil. An Array was passed in from bin/rspec:3:in `load' See merge request !3887
\| * \|	Re-generate Spring binstubs for updated version of Spring	Robert Speicher	2016-04-22	6	-10/+30
\|/ / \| \| \| \| \| \| \| \| \| \| \| \|	Prevents output like this: Array values in the parameter are deprecated. Please use a String or nil. An Array was passed in from bin/rspec:3:in `load'
* \|	Merge branch 'ha_docs' into 'master'	Drew Blessing	2016-04-22	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken link in HA docs Whoops! Fix broken link in docs from gitlab-org/gitlab-ce!3579 See merge request !3890
\| * \|	Fix link	Drew Blessing	2016-04-22	1	-1/+1
\| \| \|
* \| \|	Merge branch 'ha_docs' into 'master'	Drew Blessing	2016-04-22	7	-0/+524
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated HA docs and open to public Closes https://dev.gitlab.org/gitlab/organization/issues/624 We still need to go through the old gitlab.com/standard/high-availability and move relevant docs over, plus do some docs on DRBD. However, I think this is a good volume for the first pass. Can we get this out there and then iterate? cc/ @axil @patricio For your review, please. See merge request !3579
\| * \|	New HA docs [ci skip]	Drew Blessing	2016-04-22	7	-0/+524
\|/ /
* \|	Merge branch 'sidekiq_troubleshooting' into 'master'	Drew Blessing	2016-04-22	2	-0/+163
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Sidekiq troubleshooting docs Closes #15287 cc/ @stanhu @jacobvosmaer @dstanley See merge request !3802
\| * \|	Add Sidekiq troubleshooting docs [ci skip]	Drew Blessing	2016-04-22	2	-0/+163
\| \| \|
* \| \|	Merge branch 'rs-todos-feature-spec' into 'master'	Robert Speicher	2016-04-22	1	-18/+20
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor Todos feature spec to be faster and less brittle We now only create two Todos instead of 21 when testing pagination, and we've updated the test to be less brittle when dealing with slower CI environments. See merge request !3889
\| * \| \|	Refactor Todos feature spec to be faster and less brittle	Robert Speicher	2016-04-22	1	-18/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We now only create two Todos instead of 21 when testing pagination, and we've updated the test to be less brittle when dealing with slower CI environments.
* \| \| \|	Merge branch '15513-fix-undefined-can-method' into 'master'	Robert Speicher	2016-04-22	3	-2/+25
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use the `can?` helper instead of `current_user.can?` Fixes #15513. See merge request !3882
\| * \| \|	Use the `can?` helper instead of `current_user.can?`15513-fix-undefined-can-method	Rémy Coutable	2016-04-22	3	-2/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #15513. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch 'escape-label-title' into 'master'	Jacob Schatz	2016-04-22	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correctly escapes label title in filters Fixes #15522 See merge request !3880
\| * \| \| \|	Escapes label title in filtersescape-label-title	Phil Hughes	2016-04-22	1	-1/+1
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #15522
* \| \| \|	Merge branch 'fix/cherry-pick-specs-location' into 'master'	Robert Speicher	2016-04-22	1	-0/+0
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move cherry-pick feature specs to proper directory Cherry pick feature specs were located in `spec/feature/project` directory while we have `spec/feature/projects`. Later location is consistent with our namespaces (we have `Projects::` namespace, not `Project::`). See merge request !3875
\| * \| \| \|	Move cherry-pick feature specs to proper directoryfix/cherry-pick-specs-location	Grzegorz Bizon	2016-04-22	1	-0/+0
\| \|/ / /
* \| \| \|	Merge branch 'doc/gitlab-shell-tag' into 'master'	Achilleas Pipinellis	2016-04-22	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump gitlab-shell to 2.7.2 Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15525 See merge request !3884
\| * \| \| \|	Bump gitlab-shell to 2.7.2	Achilleas Pipinellis	2016-04-22	1	-1/+1
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \|	Merge branch 'issue_3799' into 'master'	Rémy Coutable	2016-04-22	2	-30/+27
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add tests for filtering owned projects REF: #3799 See merge request !3873
\| * \ \ \	Merge remote-tracking branch 'origin/master' into issue_3799	Alfredo Sumaran	2016-04-22	36	-63/+253
\| \|\ \ \ \ \| \| \|/ / /
\| * \| \| \|	Add tests for filtering owned projectsissue_3799	Alfredo Sumaran	2016-04-22	2	-30/+27
\| \| \| \| \|
* \| \| \| \|	Merge branch 'fix-issue-with-assignee-not-updating' into 'master'	Dmitriy Zaporozhets	2016-04-22	3	-2/+23
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed issue with assignee object not being returned Closes #15515 See merge request !3877
\| * \| \| \|	Fixed issue with assignee object not being returned	Phil Hughes	2016-04-22	3	-2/+23
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	Closes #15515
* \| \| \|	Merge branch 'issue_3799' into 'master'	Rémy Coutable	2016-04-22	4	-1/+43
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow filtering by Owned projects on dashboard page Closes #3799 ![Screen_Shot_2016-04-15_at_9.40.52_PM](/uploads/440498c5647bda282304891307931a02/Screen_Shot_2016-04-15_at_9.40.52_PM.png) See merge request !3762
\| * \| \|	Merge remote-tracking branch 'origin/master' into issue_3799	Alfredo Sumaran	2016-04-21	309	-1422/+4992
\| \|\ \ \
\| * \| \| \|	Update CHANGELOG	Alfredo Sumaran	2016-04-21	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Do not display filters if user if there's no current_user	Alfredo Sumaran	2016-04-21	1	-7/+8
\| \| \| \| \|
\| * \| \| \|	Use compact syntax	Alfredo Sumaran	2016-04-21	1	-4/+1
\| \| \| \| \|
\| * \| \| \|	Add tests	Alfredo Sumaran	2016-04-18	1	-0/+30
\| \| \| \| \|
\| * \| \| \|	Remove Spinach feature	Alfredo Sumaran	2016-04-18	2	-19/+0
\| \| \| \| \|
\| * \| \| \|	Allow filtering by Owned projects	Alfredo Sumaran	2016-04-18	4	-1/+33
\| \| \| \| \|
* \| \| \| \|	Merge branch 'doc-gh-import-additions' into 'master'	Achilleas Pipinellis	2016-04-22	1	-5/+9
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add newest enhancements to GH importer docs [ci skip] See merge request !3867
\| * \| \| \| \|	Add newest enhancements to GH importer docs	Achilleas Pipinellis	2016-04-22	1	-5/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]