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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'create-wikis-during-check' into 'master'	Douwe Maan	2016-05-04	1	-5/+28
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Initialize wikis on legacy projects during check Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/4173 Helps https://gitlab.com/gitlab-org/gitlab-ce/issues/15423 See merge request !3931
\| *	Initialize wikis on legacy projects during check	Jacob Vosmaer	2016-04-26	1	-5/+28
\| \|
* \|	Merge branch 'rs-unique-signup-fields' into 'master'	Douwe Maan	2016-05-04	2	-20/+20
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve uniqueness of field names on the signup form Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15075 See merge request !3826
\| * \|	Improve uniqueness of field names on the signup formrs-unique-signup-fields	Robert Speicher	2016-04-19	2	-20/+20
\| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15075
* \| \|	Fix a spec that was failing due to !3483	Rémy Coutable	2016-05-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Spec were skipped in this MR so that tests started to fail in master instead of in this MR! Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \|	Merge branch 'upgrade-rspec-rails' into 'master'	Robert Speicher	2016-05-03	1	-6/+0
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update rspec-rails from 3.3.3 to 3.4.2. This allows the removal of the monkey patch from this commit: 47ff1c56089b3df9c36b77c02f0f3db54fea1d54 It'll also make it slightly easier to upgrade to 3.5.0 later. Changelog: https://github.com/rspec/rspec-rails/blob/master/Changelog.md#340--2015-11-11 See merge request !3999
\| * \| \|	Update rspec-rails from 3.3.3 to 3.4.2.	Connor Shea	2016-05-01	1	-6/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows the removal of the monkey patch from this commit: 47ff1c56089b3df9c36b77c02f0f3db54fea1d54 It'll also make it slightly easier to upgrade to 3.5.0 later. Changelog: https://github.com/rspec/rspec-rails/blob/master/Changelog.md#340--2015-11-11
* \| \| \|	Merge remote-tracking branch 'dev/master' into 'master'	Robert Speicher	2016-05-02	29	-241/+788
\|\ \ \ \
\| * \| \| \|	Prevent privilege escalation via notes API	Robert Speicher	2016-04-26	1	-10/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15577
\| * \| \| \|	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	Marin Jankovski	2016-04-26	28	-231/+757
\| \|\ \ \ \
\| \| * \ \ \	Merge branch '15579-filter-milestone-confidential-issues-api' into 'master'	Robert Speicher	2016-04-26	1	-1/+30
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent information disclosure via milestone API Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15579 See merge request !1961
\| \| \| * \| \| \|	Improve Milestones API specs	Rémy Coutable	2016-04-25	1	-36/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| \| \| * \| \| \|	Filter confidential issues from milestones API if user does not have access	Stan Hu	2016-04-25	1	-1/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15579
\| \| * \| \| \| \|	Merge branch '15591-fix-project-leak-in-new-mr-view' into 'master'	Robert Speicher	2016-04-25	1	-0/+10
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent information disclosure via new merge request page Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15591. See merge request !1963
\| \| \| * \| \| \| \|	Prevent private project name and namespace from leaking in the new MR view	Rémy Coutable	2016-04-25	1	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #15591. Signed-off-by: Rémy Coutable <remy@rymai.me>
\| \| * \| \| \| \| \|	Merge branch 'fix-impersonation-issue' into 'master'	Robert Speicher	2016-04-25	3	-20/+143
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent privilege escalation via "impersonate" feature Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15548 See merge request !1956
\| \| \| * \| \| \| \| \|	Fix typo	Douwe Maan	2016-04-22	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Fix issue with impersonation	Douwe Maan	2016-04-22	3	-20/+143
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge branch 'fix-private-snippet-api' into 'master'	Robert Speicher	2016-04-25	2	-1/+88
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent information disclosure via snippet API Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15580 See merge request !1958
\| \| \| * \| \| \| \| \| \|	Prevent private snippets in public/internal projects from being leaked via API	Stan Hu	2016-04-25	2	-1/+88
\| \| \| \| \|/ / / / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15580
\| \| * \| \| \| \| \| \|	Ensure URL in all Service subclasses are valid	Rémy Coutable	2016-04-25	21	-209/+486
\| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Support e-mail notifications for comments on project snippets	Stan Hu	2016-05-02	1	-16/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #2334
* \| \| \| \| \| \| \|	Merge branch '15527-fix-wiki-page-creation-issue' into 'master'	Robert Speicher	2016-05-02	2	-0/+127
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix error when trying to create a wiki page Closes #15527, #15569, #15623, #15630, #15637, #15653, #15870, #16558, #16875, #16987, #17016, https://github.com/gitlabhq/gitlabhq/issues/10317. See merge request !3924
\| * \| \| \| \| \| \| \|	Simplify specs by not over-expecting15527-fix-wiki-page-creation-issue	Rémy Coutable	2016-05-02	2	-28/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \|	Fix error when trying to create a wiki page	Rémy Coutable	2016-04-29	2	-0/+133
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #15527. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \|	Merge branch 'feature/backport-safewebhooks' into 'master'	Robert Speicher	2016-05-02	2	-16/+34
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backported minimal safewebhook implementation to GitLab CE This brings a minimal implementation for gitlab-org/gitlab-ce#13478 backported from EE (gitlab-org/gitlab-ee!334). Also added UI to configure Secret Token Fixes #15365. See merge request !3940
\| * \| \| \| \| \| \| \|	Backported minimal safewebhook implementation to GitLab CE	Gabriel Mazetto	2016-04-30	2	-16/+34
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'fix/handle-issue-move-access' into 'master'	Robert Speicher	2016-04-30	1	-0/+39
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Handle issue move access instead of raising error Closes #15533 See merge request !3990
\| * \| \| \| \| \| \| \|	Handle issue move access instead of raising errorfix/handle-issue-move-access	Grzegorz Bizon	2016-04-30	1	-0/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #15533
* \| \| \| \| \| \| \| \|	Use a query in Project#protected_branch?	Yorick Peterse	2016-04-29	1	-0/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This changes Project#protected_branch? to use a query to check if a branch is protected, instead of loading all ProtectedBranch records into memory just to check if the list of names includes a given branch name.
* \| \| \| \| \| \| \| \|	Removes duplicates from the label dropdown	Phil Hughes	2016-04-29	1	-0/+29
\| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It concats the duplicate labels into a single label in the dropdown with the color being a gradient of the differnet colors being concatted. Closes #16555
* \| \| \| \| \| \| \|	Merge branch 'gitattributes' into 'master'	Rémy Coutable	2016-04-29	2	-0/+40
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support supressing text file diffs on the default branch with .gitattributes This change allows users to suppress diffs for text files by adding an entry to the `.gitattributes` file. To take effect the file present at the HEAD of the default branch. When rendering a diff, if the file is text according to the charlock holmes gem (via the `text?` method) but the file is not diffable according to the project repository, then a message is displayed stating that the diff was suppressed. ![image](/uploads/2e119b725875a301e30d9ad482e283b3/image.png) I looked into ways to do this using a `binary` flag as suggested by @stanhu in [this comment](https://gitlab.com/gitlab-org/gitlab-ce/issues/2315#note_4435454), however, there was no good way to seperate what was a real binary file from one that had been marked as not diffable in `.gitattributes`. Fixes and closes gitlab-org/gitlab-ce#2315. See merge request !3806
\| * \| \| \| \| \| \|	Support supressing text file diffs on the default branch with .gitattributes	Matt Oakes	2016-04-29	2	-0/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is a combination of 3 commits. - Update the bare repositories info/attributes if the default branch is updated - Check the diff attributes of a file before showing a diff - Update CHANGELOG
* \| \| \| \| \| \| \|	Use a better message when milestone is newly createdchange_message_for_newly_created_milestone	Arinde Eniola	2016-04-29	1	-0/+35
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	make some changes for the checks to determine when the messages should be displayed add item to changelog and also integration test make some changes to the test make some changes
* \| \| \| \| \| \|	Load the "New Branch" button asynchronously	Yorick Peterse	2016-04-28	1	-5/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This button depends on Issue#can_be_worked_on? which in turn depends on Issue#related_branches. By rendering this button asynchronously we can finally remove all usages of Issue#related_branches and Issue#referenced_merge_requests from the issues "show" page.
* \| \| \| \| \| \|	Merge branch 'todos-tests-fix' into 'master'	Robert Speicher	2016-04-28	1	-2/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Todos test Another attempt to fix random fail on Todos test. See merge request !3953
\| * \| \| \| \| \| \|	Fix Todos testtodos-tests-fix	Alfredo Sumaran	2016-04-27	1	-2/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'fix/ci-skipped-status' into 'master'	Rémy Coutable	2016-04-28	2	-74/+126
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Build status `canceled` if any of the jobs canceled Before this change in case of any of the jobs had been canceled, build status was `failed`. Closes #14207 See merge request !3778
\| * \| \| \| \| \| \| \|	Reorder asserts is ci commits specs for consistency	Grzegorz Bizon	2016-04-28	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add tests exercising builds scheduler after cancel	Grzegorz Bizon	2016-04-28	1	-0/+18
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Refactor ci commit specs by adding context blocks	Grzegorz Bizon	2016-04-28	1	-77/+85
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Render canceled status if any of the jobs canceled	Grzegorz Bizon	2016-04-27	1	-0/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This status will be returned only when there are no failed jobs that are not allowed to fail.
* \| \| \| \| \| \| \| \|	Merge branch 'use-remote-ip-for-akismet' into 'master'	Rémy Coutable	2016-04-28	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use ActionDispatch Remote IP for Akismet checking Previously all remote IPs appeared at 127.0.0.1, which made Akismet not very useful. Using the ActionDispatch Remote IP (http://api.rubyonrails.org/classes/ActionDispatch/RemoteIp.html) should provide more reliable results. Closes #16629 See merge request !3961
\| * \| \| \| \| \| \| \| \|	Use ActionDispatch Remote IP for Akismet checking	Stan Hu	2016-04-27	1	-1/+1
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously all remote IPs appeared at 127.0.0.1, which made Akismet not very useful. Using the ActionDispatch Remote IP (http://api.rubyonrails.org/classes/ActionDispatch/RemoteIp.html) should provide more reliable results. Closes #16629
* \| \| \| \| \| \| \| \|	Merge branch 'fix-github-enterprise-imports' into 'master'	Rémy Coutable	2016-04-28	3	-6/+49
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport GitHub Enterprise import support from EE These changes were pulled from GitLab EE to support configuring an alternative API URL than the default https://api.github.com. In addition, the `verify_ssl` flag allows users to disable SSL cert checking. One modification: add a default `args` option if it does not exist to avoid breaking existing configurations. See merge request !3892
\| * \| \| \| \| \| \| \|	Backport GitHub Enterprise import support from EE	Stan Hu	2016-04-26	3	-6/+49
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These changes were pulled from GitLab EE to support configuring an alternative API URL than the default https://api.github.com. In addition, the `verify_ssl` flag allows users to disable SSL cert checking. One modification: add a default `args` option if it does not exist to avoid breaking existing configurations.
* \| \| \| \| \| \| \|	Merge branch 'project-dropdown-tests' into 'master'	Jacob Schatz	2016-04-27	1	-0/+27
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Project title dropdown tests Added a test for when on an issue page to check whether the project dropdown links will still work See !3870 See merge request !3921
\| * \| \| \| \| \| \| \|	Project title dropdown testsproject-dropdown-tests	Phil Hughes	2016-04-26	1	-0/+27
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added a test for when on an issue page to check whether the project dropdown links will still work See !3870
* \| \| \| \| \| \| \|	Merge branch 'sidebar-label-link' into 'master'	Jacob Schatz	2016-04-27	1	-4/+4
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated label links to work correctly for filtering See !3846#note_5033951 See merge request !3920
\| * \| \| \| \| \| \|	Updated label links to work correctly for filteringsidebar-label-link	Phil Hughes	2016-04-26	1	-4/+4
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See !3846#note_5033951