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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'confidential-issues' into 'master'	Douwe Maan	2016-03-18	4	-5/+13
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add confidential issues Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/3678 More information: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/227 See merge request !3282
\| *	Restrict access to confidential issues on search results	Douglas Barbosa Alexandre	2016-03-17	2	-4/+6
\| \|
\| *	Restrict access to confidential issues through API	Douglas Barbosa Alexandre	2016-03-17	1	-1/+2
\| \|
\| *	Restrict access to references for confidential issues	Douglas Barbosa Alexandre	2016-03-17	1	-0/+5
\| \|
* \|	Show a notice for diffs that are too largehide-large-diffs	Yorick Peterse	2016-03-18	1	-0/+4
\|/ \| \| \| \| \| \|	This builds on the changes introduced in https://gitlab.com/gitlab-org/gitlab_git/merge_requests/72 and results in merge requests with large diffs (e.g. due to them containing minified CSS) loading much faster.
*	Merge branch 'artem-forks/gitlab-ce-nginx-rel-url'	Jacob Vosmaer	2016-03-17	2	-2/+19
\|\
\| *	Do not serve anything via nginx as we have workhorse	Artem Sidorenko	2016-03-11	2	-2/+19
\| \| \| \| \| \| \| \| \| \|	Otherwise this might 'hide' problems https://github.com/gitlabhq/gitlabhq/issues/10053#issuecomment-188919319
* \|	Merge branch 'patch/refactor-post-receive' into 'master'	Douwe Maan	2016-03-17	1	-0/+60
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PostReceive refactor Back-ported PostReceive refactor made for https://gitlab.com/gitlab-org/gitlab-ee/issues/367 in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/267 See merge request !3264
\| * \|	Back-porting PostReceive refactor made for EE 🍺	Gabriel Mazetto	2016-03-17	1	-0/+60
\| \| \|
* \| \|	Merge branch '4009-external-users' into 'master'	Douwe Maan	2016-03-17	2	-3/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	External Users The user has the rights of a public user execpt it can never create a project, group, or team. Also it cant view internal projects. Partially fix for both #4009 and #13938 (except the LDAP sync or a pattern to detect external users) ![Screen_Shot_2016-03-14_at_22.02.52](/uploads/486a84ab3acb98c6cfb71a4ec7d268e2/Screen_Shot_2016-03-14_at_22.02.52.png) See merge request !3171
\| * \| \|	Add missing API docs on external user	Achilleas Pipinellis	2016-03-17	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \|	API support for setting External flag on existing users	Zeger-Jan van de Weg	2016-03-17	1	-1/+2
\| \| \| \|
\| * \| \|	Merge branch 'master' into 4009-external-users4009-external-users	Zeger-Jan van de Weg	2016-03-15	4	-10/+43
\| \|\ \ \
\| * \| \| \|	Doc external users feature	Zeger-Jan van de Weg	2016-03-15	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Merge branch 'master' into 4009-external-users	Zeger-Jan van de Weg	2016-03-14	2	-0/+34
\| \|\ \ \ \
\| * \| \| \| \|	External Users	Zeger-Jan van de Weg	2016-03-13	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The user has the rights of a public user execpt it can never create a project, group, or team. Also it cant view internal projects.
* \| \| \| \| \|	Follow the CSS Style Guide rules for unitless zero values.	connorshea	2016-03-16	1	-0/+1
\| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated Emoji Rake task to conform to style guide. Discussed in #14299. [ci skip]
* \| \| \| \|	Return an empty Array when there aren't lines to parse.	Rubén Dávila	2016-03-15	1	-0/+2
\| \| \| \| \|
* \| \| \| \|	Merge branch 'master' into git-2-7-3	Douwe Maan	2016-03-15	4	-10/+43
\|\ \ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|
\| * \| \| \|	Merge branch 'css-style-guide' into 'master'	Jacob Schatz	2016-03-15	1	-0/+10
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CSS style guide Working towards what was discussed in #13552, this adds the [SCSS Linter gem](https://github.com/brigade/scss-lint) for style guide conformity in CI. TODO: - [x] Agree on and write SCSS Style Guide Documentation. - [x] Document the `scss-lint` config file. - [x] Figure out how best to run this in CI, right now it's taking longer than I would think it should. - [x] Use CSSComb for auto-correction (Maybe just include a CSSComb config file and have developers run the node package manually if they're interested in using it?). My logic for not using CSSComb in the first place is that, AFAIK, we don't currently require Node/NPM, even in the dev environment. Maybe I'm wrong about that? `scss-lint` is a Ruby implementation of a similar concept, but it doesn't include autocorrect. Is there a way we can run get GitLab CI to run `scss-lint` without having to put together the full GitLab application? Seeing as it's just static analysis, it seems like a waste of time/resources. /cc @jschatz1 @rspeicher See merge request !3069
\| \| * \| \| \|	Add SCSS Lint, CSSComb config file, run SCSS Lint in GitLab CI, add ↵	connorshea	2016-03-14	1	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	documentation for SCSS Style Guide. See !3069 for more information.
\| * \| \| \| \|	Merge branch 'rs-issue-14220' into 'master'	Douwe Maan	2016-03-15	1	-2/+7
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Be more intelligent about sanitizing links with unsafe protocols This prevents false matches on relative links like `[database](database.md)`. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14220 See merge request !3210
\| \| * \| \| \| \|	Be more intelligent about sanitizing links with unsafe protocolsrs-issue-14220	Robert Speicher	2016-03-14	1	-2/+7
\| \| \| \|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This prevents false matches on relative links like `[database](database.md)`. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14220
\| * \| \| \| \|	Merge branch 'fix-commit-status-rendering' into 'master'	Robert Speicher	2016-03-15	1	-7/+0
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cleanup Ci::Commit, Ci::Build and CommitStatus views This MR tries to do first sweep of cleanups to Ci::Commit and Ci::Build objects removing all view-related functions and fixing the API from other side. Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/6046 See merge request !2760
\| \| * \| \| \| \|	Cleanup CiCommit and CiBuild	Kamil Trzcinski	2016-03-14	1	-7/+0
\| \| \| \|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Remove all view related methods from Ci::Build and CommitStatus - Remove unused Ci::Commit and Ci::Build methods - Use polymorphism to render different types of CommitStatus
\| * \| \| \| \|	Merge branch 'gitlab-ci-yaml-updates' into 'master'	Douwe Maan	2016-03-14	1	-1/+26
\| \|\ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	New CI YAML features This introduces a couple of small `.gitlab-ci.yml` features: 1. Documentation for: Allow to use YAML anchors when parsing the `.gitlab-ci.yml`: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2958 2. Ignore jobs that start with `.` 3. Allow to pass name of created artifacts archive in `.gitlab-ci.yml` 4. Allow to define on which builds the current one depends on These are really small changes so it makes not sense to create a separate merge requests for them. @axil Could you review the documentation part? The implementation on GitLab Runner side: https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/merge_requests/113. Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/13755 https://gitlab.com/gitlab-org/gitlab-ce/issues/14211 https://gitlab.com/gitlab-org/gitlab-ce/issues/3423 cc @grzesiek @axil @DouweM See merge request !3182
\| \| * \| \| \|	Merge branch 'master' into gitlab-ci-yaml-updates	Achilleas Pipinellis	2016-03-12	7	-39/+63
\| \| \|\ \ \ \
\| \| * \ \ \ \	Merge remote-tracking branch 'origin/master' into gitlab-ci-yaml-updates	Kamil Trzcinski	2016-03-11	1	-1/+1
\| \| \|\ \ \ \ \ \| \| \| \| \|_\|_\|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
\| \| * \| \| \| \|	Allow to define on which builds the current one depends on	Kamil Trzcinski	2016-03-11	1	-1/+20
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Allow to pass name of created artifacts archive in `.gitlab-ci.yml`	Kamil Trzcinski	2016-03-11	1	-0/+4
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Describe special YAML features: the use of anchors and hidden jobs	Kamil Trzcinski	2016-03-11	1	-0/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Bump Git version requirement to 2.7.3	Douwe Maan	2016-03-15	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'share-project-ce' into 'master'	Dmitriy Zaporozhets	2016-03-14	2	-0/+31
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bring from EE: Share Project with Group - [x] Models and migrations - [x] Logic, UI - [x] Tests - [x] Documentation - [x] Share with group lock - [x] Api feature - [x] Api docs - [x] Api tests Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> For #12831 cc @DouweM @rspeicher @vsizov See merge request !3186
\| * \| \| \| \| \|	Bring share project with group API from EEshare-project-ce	Dmitriy Zaporozhets	2016-03-13	2	-0/+31
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \|	Merge branch 'rs-snippet-expires-api' into 'master'	Robert Speicher	2016-03-14	1	-0/+3
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't remove `ProjectSnippet#expires_at` from API See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3103 This partially reverts commit 836d5930332797192094ce4a3c8083e96f7e8c53. See merge request !3144
\| * \| \| \| \|	Don't remove `ProjectSnippet#expires_at` from APIrs-snippet-expires-api	Robert Speicher	2016-03-09	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3103 This partially reverts commit 836d5930332797192094ce4a3c8083e96f7e8c53.
* \| \| \| \| \|	Revert "Revert "Merge branch 'support-go-subpackages' into 'master' ""	Stan Hu	2016-03-12	1	-0/+50
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 5a586f364c5d2b866d6a074eff7996f05585b7d5
* \| \| \| \| \|	Revert "Merge branch 'support-go-subpackages' into 'master' "	Douwe Maan	2016-03-12	1	-50/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !3191
* \| \| \| \| \|	Merge branch 'support-go-subpackages' into 'master'	Douwe Maan	2016-03-12	1	-0/+50
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support Golang subpackage fetching Closes #13805 See merge request !3191
\| * \| \| \| \|	Ensure PATH_INFO exists for go-get	Stan Hu	2016-03-12	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Simplify code	Stan Hu	2016-03-12	1	-4/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Support Golang subpackage fetchingsupport-go-subpackages	Stan Hu	2016-03-12	1	-0/+51
\| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #13805
* \| \| \| \|	Merge branch 'fix-gh-pr-import' into 'master'	Douwe Maan	2016-03-12	2	-9/+12
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix importing PR's from GitHub when the source repo was removed Closes #13847 Closes gitlab-com/support-forum#584 See merge request !3172
\| * \| \| \| \|	Fix importing PR's from GitHub when the source repo was removed	Douglas Barbosa Alexandre	2016-03-10	2	-9/+12
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵redis-config-parser	Jacob Vosmaer	2016-03-10	1	-0/+121
\| \|\ \ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \| \| \| \| \| \| \|	redis-config-parser
* \| \| \| \| \|	Merge branch 'rs-issue-12944' into 'master'	Douwe Maan	2016-03-11	1	-0/+23
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use a custom Devise failure app to handle unauthenticated .zip requests Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/12944 See merge request !2828
\| * \| \| \| \| \|	Use a custom Devise failure app to handle unauthenticated .zip requestsrs-issue-12944	Robert Speicher	2016-03-08	1	-0/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/12944
* \| \| \| \| \| \|	Removed order from sub-query projects for search	Yorick Peterse	2016-03-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There's no need to order queries used as sub-queries and doing so can add potential overhead.
* \| \| \| \| \| \|	Added ProjectSearchResults#project_ids_relation	Yorick Peterse	2016-03-11	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This ensures some other methods such as the "issues" method still work.
* \| \| \| \| \| \|	Refactor Gitlab::ProjectSearchResults	Yorick Peterse	2016-03-11	1	-7/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously this class would be given a project ID which was then used to retrieve the corresponding Project object. However, in all cases the Project object was already known as it was used to grab the ID to pass to ProjectSearchResults. By just passing a Project instead we remove the need for an extra query as well as the need for some other complexity in this class.