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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Auto annotate models on migrationannotate-models	Zeger-Jan van de Weg	2016-05-06	1	-0/+44
\| \| \| \|	[ci skip]
*	Merge branch 'use-rugged-to-create-tag' into 'master'	Rémy Coutable	2016-05-04	1	-18/+0
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use Rugged's TagCollection#create instead of gitlab-shell's Repository#add_tag for better performance This was originally opened at !1757 by @pcarranza but I changed it to use Rugged instead of gitlab_git, following @DouweM's request. Once this is merged, https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/26 will be mergeable too. See merge request !3745
\| *	Use Rugged's TagCollection#create instead of gitlab-shell's ↵	Rémy Coutable	2016-05-04	1	-18/+0
\| \| \| \| \| \| \| \| \| \| \| \|	Repository#add_tag for better performance Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Merge branch 'pacoguzman/gitlab-ce-15001-since-and-until-operators-api-commits'	Douwe Maan	2016-05-04	3	-2/+24
\|\ \ \| \|/ \|/\| \| \| \| \|	# Conflicts: # Gemfile.lock
\| *	API support for the 'since' and 'until' operators on commit requests	Paco Guzman	2016-04-29	3	-2/+24
\| \| \| \| \| \|	- Parameter validation as ISO8601 format
* \|	Merge remote-tracking branch 'dev/master' into 'master'	Robert Speicher	2016-05-02	2	-6/+19
\|\ \
\| * \	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	Marin Jankovski	2016-04-26	2	-6/+19
\| \|\ \ \| \| \|/ \| \|/\|
\| \| *	Merge branch '15579-filter-milestone-confidential-issues-api' into 'master'	Robert Speicher	2016-04-26	1	-1/+9
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent information disclosure via milestone API Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15579 See merge request !1961
\| \| \| *	Filter confidential issues from milestones API if user does not have access	Stan Hu	2016-04-25	1	-1/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15579
\| \| * \|	Merge branch 'fix-private-snippet-api' into 'master'	Robert Speicher	2016-04-25	1	-5/+10
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-5/+10
\| \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15580
* \| \| \|	Properly handle bigger files	Zeger-Jan van de Weg	2016-04-28	1	-4/+9
\| \| \| \|
* \| \| \|	Replace gitlab-workhorse with GitLab Workhorse where appropriateinitd_gitlab_workhorse_rename	Achilleas Pipinellis	2016-04-28	1	-6/+6
\| \| \| \|
* \| \| \|	Merge branch 'use-remote-ip-for-akismet' into 'master'	Rémy Coutable	2016-04-28	2	-4/+12
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-4/+12
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
* \| \| \|	Backport GitHub Enterprise import support from EE	Stan Hu	2016-04-26	1	-4/+11
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 'emoji-unicode-fix' into 'master'	Jacob Schatz	2016-04-25	1	-0/+4
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes issue with emoji comments not showing correct emoji image Previously it would look for the unicode character inside the award menu. But this menu might not always be there. Now, the unicode characters are loaded onto the page in an array which the award emoji that looks in to get the correct emoji unicode character Fixes #15512 See merge request !3885
\| * \| \|	Removed usage of normilizeEmojiName methodemoji-unicode-fix	Phil Hughes	2016-04-22	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed some Ruby based on feedback
\| * \| \|	Fixes issue with emoji comments not showing correct emoji image	Phil Hughes	2016-04-22	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously it would look for the unicode character inside the award menu. But this menu might not always be there. Now, the unicode characters are loaded onto the page in an array which the award emoji that looks in to get the correct emoji unicode character Fixes #15512
* \| \| \|	Merge branch 'issue_14904' into 'master'	Jacob Schatz	2016-04-25	1	-0/+1
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add new shortcuts Closes #14904 - On a project: `i` To navigate to New Issue page. - On a issuable: `l` To open Label dropdown on a issuable. - Global: Typing `?` multiple times now toggles the modal. See merge request !3686
\| * \| \|	Merge remote-tracking branch 'origin/master' into issue_14904	Alfredo Sumaran	2016-04-21	5	-41/+40
\| \|\ \ \
\| * \ \ \	Merge remote-tracking branch 'origin/master' into issue_14904	Alfredo Sumaran	2016-04-20	3	-1/+11
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/views/shared/issuable/_sidebar.html.haml
\| * \ \ \ \	Merge remote-tracking branch 'origin/master' into issue_14904	Alfredo Sumaran	2016-04-20	16	-40/+289
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Add shortcut_path to GonHelper module	Alfredo Sumaran	2016-04-18	1	-0/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'rs-503-page' into 'master'	Dmitriy Zaporozhets	2016-04-25	2	-2/+4
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a branded 503 static error page [ci skip] Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15398 See merge request !3894
\| * \| \| \| \| \|	Add a branded 503 static error pagers-503-page	Robert Speicher	2016-04-22	2	-2/+4
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15398
* \| \| \| \| \|	Merge branch 'fix-project-hook-delete-permissions' into 'master'	Rémy Coutable	2016-04-25	1	-2/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-2/+2
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15576
* \| \| \| \| \|	Fix some typos	Tomasz Maczukin	2016-04-22	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Modify code formatting	Tomasz Maczukin	2016-04-22	1	-3/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Simplify the GitlabCiYamlProcessor#initial_parsing method	Tomasz Maczukin	2016-04-22	1	-16/+11
\| \| \| \| \| \|
* \| \| \| \| \|	Add posibility to define a hidden job without 'script' in .gitlab-ci.yml	Tomasz Maczukin	2016-04-22	1	-4/+7
\|/ / / / /
* \| \| \| \|	Merge branch 'dev_issue_15331' into 'master'	Robert Speicher	2016-04-21	1	-3/+2
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes window.opener bug Adds `noreferrer` value to rel attribute for external links REF: https://gitlab.com/gitlab-org/gitlab-ce/issues/15331 See merge request !1953
\| * \| \| \|	Fix failing spec	Alfredo Sumaran	2016-04-21	1	-2/+1
\| \| \| \| \|
\| * \| \| \|	Add noreferrer value to rel attribute for external links	Alfredo Sumaran	2016-04-20	1	-1/+1
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Use SIGTERM during Sidekiq memory shutdown	Jacob Vosmaer	2016-04-21	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This makes the memory killer behave more like 'sidekiqctl stop'.
* \| \| \|	Revert "Merge branch 'sentry-js' into 'master' "	Jacob Schatz	2016-04-21	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 0f309794e78243b1ee16ba6f1451dbb0752956c5, reversing changes made to 1e596fef1c42a1dd925636c48fea01be444dc3ab.
* \| \| \|	Merge branch 'fix/cross-project-labels-project-reference' into 'master'	Grzegorz Bizon	2016-04-21	1	-15/+21
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix cross-project label ref used with invalid project When cross-project label reference was used with invalid project reference, `nil` was assigned to project variable which later caused an exception. Closes #15168 See merge request !3811
\| * \| \| \|	Refactor banzai code that finds cross-project labels	Grzegorz Bizon	2016-04-21	1	-15/+21
\| \| \| \| \|
\| * \| \| \|	Fix cross-project label ref with invalid project	Grzegorz Bizon	2016-04-21	1	-1/+1
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	Closes #15168
* \| \| \|	Merge branch 'ci-commit-as-pipeline' into 'master'	Kamil Trzciński	2016-04-21	2	-23/+17
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ci::Commit becomes a Pipeline object 1. Ci::Commit receives context: ref, :tag. 1. One Ci::Commit describes a one Pipeline 1. Pipeline is created from `.gitlab-ci.yml` 1. Pipeline is a ordered group of builds 1. We test MR against Pipeline 1. Pipelines have a separate view (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703) 1. Pipeline can be triggered from UI (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703) 1. Later we change `Trigger -> TriggerRequest -> Build` to `Trigger -> Pipeline` (future) 1. We add a Pipeline Hook that will be triggered on Pipeline status change (future) 1. We extend notifications to use `Pipeline Hook` to send summary on pipeline changes (future) After merging that I'll prepare a separate MR that will unify naming, database columns, table names: ``` Ci::Commit -> Pipeline Ci::Build -> Build CommitStatus -> Job GenericCommitStatus -> ExternalJob ci_commits -> pipelines ci_builds -> jobs ``` This MR implements first 5 points. This is made to solve this issue https://gitlab.com/gitlab-org/gitlab-ce/issues/14149. See merge request !3653
\| * \| \|	Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineci-commit-as-pipeline	Kamil Trzcinski	2016-04-19	12	-48/+231
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| * \| \| \|	Write specs for this feature	Kamil Trzcinski	2016-04-16	1	-6/+13
\| \| \| \| \|
\| * \| \| \|	Merge remote-tracking branch 'origin/master' into ci-commit-as-pipeline	Kamil Trzcinski	2016-04-16	28	-176/+295
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| * \ \ \ \	Merge remote-tracking branch 'origin/master' into ci-commit-as-pipeline	Kamil Trzcinski	2016-04-13	14	-18/+142
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Fix create_next_builds method	Kamil Trzcinski	2016-04-12	1	-19/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into ci-commit-as-pipeline	Kamil Trzcinski	2016-04-11	3	-18/+47
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/views/projects/commits/_commit.html.haml
\| * \| \| \| \| \| \|	Fix specs	Kamil Trzcinski	2016-04-11	1	-4/+10
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Use Ci::Commit as Pipeline	Kamil Trzcinski	2016-04-11	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'fix-grape-internal-allowed-action' into 'master'	Robert Speicher	2016-04-20	2	-1/+10
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix setting of "action" for Grape transactions After wondering why we're not getting all the data in Grafana that I wanted I realized I wasn't setting the "action" field properly here. See merge request !3842