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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add Changelog entry for commit builds page fixfix/error-on-builds-page	Grzegorz Bizon	2016-04-25	1	-0/+1
\|
*	Fix error on commit builds page when no builds yet	Grzegorz Bizon	2016-04-25	2	-1/+28
\| \| \| \|	Closes #15509
*	Merge branch 'fix-cache-invalidations' into 'master'	Yorick Peterse	2016-04-25	4	-9/+7
\|\ \| \| \| \| \| \| \| \|	Fix Error 500 due to stale cache when projects are renamed or transferred See merge request !3865
\| *	Fix Error 500 due to stale cache when projects are renamed or transferred	Stan Hu	2016-04-25	4	-9/+7
\|/ \| \| \|	Closes gitlab-org/gitlab-ee#506
*	Merge branch 'scss-empty-rule' into 'master'	Jacob Schatz	2016-04-25	5	-13/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable the EmptyRule SCSS Linter Prevents empty SCSS rules from being included in the SCSS. Also fixes the handful of lints caught by the linter. Regarding the `.gh` rule in monokai.scss, which was added in [this commit](https://gitlab.com/gitlab-org/gitlab-ce/commit/bf079c24afb8ad2991a4eaf60a71a7bc45dd775d), it appears to be empty in [the original file as well](https://github.com/richleland/pygments-css/blob/master/monokai.css). So I think it's fine to delete the selector. cc: @jschatz1 See merge request !3769
\| *	Enable the EmptyRule SCSS Linter.	Connor Shea	2016-04-16	5	-13/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Prevents empty SCSS rules from being included in the SCSS. Also fixes the handful of lints caught by the linter.
* \|	Merge branch 'new-list-of-influxdb-queries' into 'master'	Yorick Peterse	2016-04-25	1	-28/+47
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Updated list of InfluxDB queries/config See merge request !3840
\| * \|	Updated list of InfluxDB queries/config	Yorick Peterse	2016-04-25	1	-28/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This setup is quite a bit different from before. In the previous setup raw data was kept around for 30 days and downsampled data for 7 days. This became problematic for GitLab.com as the number of points and series resulted in InfluxDB running out of memory when starting up (besides taking up 30 GB of storage). To work around this the new setup keeps raw data around for _only_ an hour while keeping downsampled data around for 7 days. In turn all Grafana dashboards _only_ query the downsampled data instead of also querying raw data. Based on rough calculations this setup needs around 2GB of storage for 1 week of data, excluding whatever is needed for storing the raw data (this highly depends on the amount of traffic). If users want to use this new setup they have to remove any existing dashboards provided by GitLab.com and re-import the ones from the Grafana dashboards repository (https://gitlab.com/gitlab-org/grafana-dashboards/). Should users wish to change their default retention policy the easiest way of doing so is to simply drop the database and re-run the InfluxDB commands added by this commit. Users who want to keep their default retention policy as-is can simply create the "downsampled" policy and run the other commands.
* \| \|	Fix 8.7.1 CHANGELOG	Rémy Coutable	2016-04-25	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \|	Merge branch 'master' of https://dev.gitlab.org/gitlab/gitlabhq	Rémy Coutable	2016-04-25	3	-4/+17
\|\ \ \
\| * \ \	Merge branch 'fix-project-hook-delete-permissions' into 'master'	Rémy Coutable	2016-04-25	3	-4/+15
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent users from deleting Webhooks via API they do not own Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15576 See merge request !1959
\| \| * \| \|	Prevent users from deleting Webhooks via API they do not own	Stan Hu	2016-04-24	3	-4/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15576
* \| \| \| \|	Merge branch '15470-fix-unknown-license-not-shown' into 'master'	Rémy Coutable	2016-04-25	5	-48/+59
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix license detection to detect all license files, not only known licenses Fixes #15470. See merge request !3878
\| * \| \| \|	Fix license detection to detect all license files, not only known licenses	Rémy Coutable	2016-04-25	5	-48/+59
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #15470. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	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
\| \|\ \ \ \ \ \ \| \| \|/ / / / /