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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'mailroom-arbitration' into 'master'	Robert Speicher	2015-10-13	1	-4/+30
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Enable arbitration in MailRoom Fixes #2870. See merge request !1566
\| *	Remove warning about Reply by email and HAmailroom-arbitration	Douwe Maan	2015-10-12	1	-4/+0
\| \|
\| *	Enable arbitration in MailRoom	Douwe Maan	2015-10-11	1	-0/+30
\| \|
* \|	Merge pull request #9723 from sue445/tweak_api_doc	Stan Hu	2015-10-13	1	-0/+2
\|\ \ \| \| \| \| \| \|	Tweak api doc
\| * \|	[ci skip] Add missing parameters in API doc	sue445	2015-10-14	1	-0/+2
\| \| \|
* \| \|	Merge branch 'add-wip-to-mr-hook-attrs' into 'master'	Stan Hu	2015-10-13	1	-2/+4
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	merge_request: add work_in_progress to MR hooks See merge request !1443
\| * \|	merge_request: add work_in_progress to MR hooks	Ben Boeckel	2015-10-08	1	-2/+4
\| \| \|
* \| \|	Merge branch 'commit_status' into 'master'	Kamil Trzciński	2015-10-13	1	-1/+83
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement Commit Status API This is preliminary implementation of Commit Status API, pretty much compatible with GitHub. 1. The Commit Statuses are stored in separate table: ci_commit_status. 2. The POST inserts a new row. 3. To POST execute GitLab API `post :id/repository/commits/:sha/status`. This accepts dual authorization: - Using authorized user - Using ci-token to allow easy posting from CI Services 4. This adds predefined variable to GitLab CI build environment: CI_BUILD_STATUS_URL, allowing to easy post status from within build (ex. with code coverage or other metrics). 5. This adds statuses to commit's builds view. 6. The commit's status is calculated taking into account status of all builds and all posted statuses. 7. The commit statuses doesn't trigger notifications. 8. The commit status API introduces two new privileges: `read_commit_statuses` and `create_commit_status`. 9. We still miss a few tests and documentation updates for API and CI. @dzaporozhets @sytses What do you think? See merge request !1530
\| * \| \|	Small bug fixes	Kamil Trzcinski	2015-10-12	1	-1/+0
\| \| \| \|
\| * \| \|	Add Commit Status documentation	Kamil Trzcinski	2015-10-12	1	-0/+82
\| \| \| \|
\| * \| \|	Implement Commit Status API	Kamil Trzcinski	2015-10-12	1	-1/+2
\| \| \| \|
* \| \| \|	Merge branch 'fix-patch_guide' into 'master'	Hannes Rosenögger	2015-10-12	1	-2/+4
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	don't set LATEST_TAG automatically in patch update guide As discussed in https://gitlab.com/gitlab-org/gitlab-ce/issues/2607, this removes the automatic setting of the LATEST_TAG variable in the update guide, because it could get set to rc versions. Instead, a command was added to list all tags, with the most recent one being on the end of the list. Also a note was added to prevent users from updating to new minor/major versions because the tag list includes all tags. [ci skip] See merge request !1510
\| * \| \|	don't set LATEST_TAG automatically in patch update guide	Jan Bruckner	2015-10-05	1	-2/+4
\| \| \| \|
* \| \| \|	removed extra_sign_in_text examples for gitlab.rb [ci skip]	Dale Noe	2015-10-11	1	-28/+2
\| \|_\|/ \|/\| \|
* \| \|	Update monthly release post template	Robert Speicher	2015-10-09	1	-7/+6
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \|	Merge branch 'rs-2fa-task' into 'master'	Jacob Vosmaer	2015-10-09	1	-0/+14
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add task to disable 2FA for all users Addresses #2971 See merge request !1532
\| * \| \|	Add docs for gitlab:two_factor:disable_for_all_users task	Robert Speicher	2015-10-07	1	-0/+14
\| \| \| \|
* \| \| \|	Merge branch 'update-upgrade-guide-for-redis-2.4.0' into 'master'	Stan Hu	2015-10-08	1	-2/+11
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update upgrade guide for Redis >= 2.4.0 requirement [ci skip] Closes #2837 See merge request !1468
\| * \| \|	Update upgrade guide for Redis >= 2.4.0 requirement	Stan Hu	2015-10-01	1	-2/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Closes #2837
* \| \| \|	Merge branch 'XenGi/gitlab-ce-master'	Stan Hu	2015-10-08	1	-20/+22
\|\ \ \ \
\| * \| \| \|	hooks: Add full project namespace to payload	Ricardo Band	2015-10-02	1	-20/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Payload of "project_member, :create" and "project_member, :destroy" now also have a field project_path_with_namespace.
* \| \| \| \|	Clarify Reply by email settings when using Postfix mail serverclarify-postfix	Douwe Maan	2015-10-07	1	-6/+61
\| \|_\|/ / \|/\| \| \|
* \| \| \|	Merge branch 'reply-by-email-known-issue' into 'master'	Robert Speicher	2015-10-05	1	-1/+5
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document known issue with Reply by email and multiple application servers. See merge request !1499
\| * \| \| \|	Add link to mail_room issue. reply-by-email-known-issue	Douwe Maan	2015-10-02	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \|	Document known issue with Reply by email and multiple application servers.	Douwe Maan	2015-10-02	1	-1/+5
\| \| \| \| \|
* \| \| \| \|	Update ci to ce doc to make it clearer when you are done if you don't want ↵	Marin Jankovski	2015-10-05	1	-2/+4
\| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \|	to keep your data.
* \| \| \|	Merge branch 'benchmark-suite' into 'master'	Yorick Peterse	2015-10-05	2	-0/+70
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Basic RSpec/benchmark-ips powered benchmark suite Corresponding issue: #2909, see the commit messages for more details. A few things to note: 1. The current use of `subject` isn't exactly easy on the eyes due to them having to return a Proc, I'm not sure yet how (and if) we can work around this. 2. The maximum amount of iterations in the current `User.by_login` benchmark is arbitrary, we might have to adjust it once said method's performance has been improved. 3. Benchmarks currently take 2 seconds to warm up and 5 seconds to run (benchmark-ips defaults). 4. The custom RSpec matcher file (`benchmark_matchers.rb`) is a bit messy, any feedback on this would be appreciated Any comments/feedback on this would be greatly appreciated. See merge request !1503
\| * \| \| \|	Added documentation for writing benchmarks	Yorick Peterse	2015-10-05	2	-0/+70
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge branch 'golang-i386' into 'master'	Achilleas Pipinellis	2015-10-05	1	-0/+3
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Golang download instructions assume amd64 See merge request !1488
\| * \| \|	Golang download instructions assume amd64golang-i386	Jacob Vosmaer	2015-10-01	1	-0/+3
\| \| \| \|
* \| \| \|	Back and forth permission on builds/migration-doc-fix	Kamil Trzcinski	2015-10-02	1	-1/+8
\| \|/ / \|/\| \|
* \| \|	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	Robert Speicher	2015-10-01	3	-3/+38
\|\ \ \
\| * \ \	Merge branch 'upgrade-version' into 'master'	Patricio Cano	2015-10-01	1	-3/+9
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Link to rake tasks I believe there should be a link to rake tasks from backup restore, to give the user more options. That is why I added the link in the documentation. Because of tweet https://twitter.com/gordonjb/status/641252693701476352 See merge request !1928
\| \| * \ \	solved conflict	karen Carias	2015-09-30	62	-273/+2984
\| \| \|\ \ \ \| \| \| \| \|/ \| \| \| \|/\|
\| \| * \| \|	made info more clear	karen Carias	2015-09-09	1	-1/+3
\| \| \| \| \|
\| \| * \| \|	link to rake tasks	karen Carias	2015-09-08	1	-1/+6
\| \| \| \| \|
\| * \| \| \|	Merge branch 'create-issue' into 'master'	Patricio Cano	2015-10-01	2	-0/+29
\| \|\ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	New doc about how to create an issue in GitLab Basics See merge request !1925
\| \| * \| \|	more info about MR and mentions	karen Carias	2015-08-31	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	New doc about how to create an issue	karen Carias	2015-08-25	2	-0/+29
\| \| \| \| \|
* \| \| \| \|	Merge branch 'etc-default-gitlab' into 'master'	Drew Blessing	2015-10-01	1	-1/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix path to /etc/default/gitlab in 8.0 update guide See merge request !1437
\| * \| \| \|	Fix path to /etc/default/gitlab in 8.0 update guideetc-default-gitlab	Jacob Vosmaer	2015-09-25	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Update migration documentation	Kamil Trzcinski	2015-10-01	1	-0/+105
\| \|_\|_\|/ \|/\| \| \|
* \| \| \|	Merge branch 'apache-gghs-tcp' into 'master'	Robert Speicher	2015-09-30	1	-0/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Apache needs gitlab-git-http-server on TCP [ci skip] See merge request !1462
\| * \| \| \|	Apache needs gitlab-git-http-server on TCPapache-gghs-tcp	Jacob Vosmaer	2015-09-29	1	-0/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'golang-ruby-versions' into 'master'	Robert Speicher	2015-09-30	1	-6/+7
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump Ruby and Golang versions [ci skip] See merge request !1467
\| * \| \| \| \|	Use Ruby 2.1.7 for new installs from sourcegolang-ruby-versions	Jacob Vosmaer	2015-09-29	1	-2/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Use Golang 1.5.1 for new installs from source	Jacob Vosmaer	2015-09-29	1	-4/+4
\| \|/ / / /
* \| \| \| \|	Merge branch 'merge-ci-data' into 'master'	Dmitriy Zaporozhets	2015-09-30	1	-5/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use data stored in projects instead of ci_projects - It delegates name, path, gitlab_url, ssh_url_to_repo - Remove ability to set this parameters using CI API This fixes GitLab project rename, namespace change, repository rename, etc. /cc @dzaporozhets See merge request !1404
\| * \| \| \| \|	Delegate ci_project parameters to projects	Kamil Trzcinski	2015-09-30	1	-5/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- It delegates name, path, gitlab_url, ssh_url_to_repo - Remove ability to set this parameters using CI API This fixes GitLab project rename, namespace change, repository rename, etc.
* \| \| \| \| \|	Add a missing RAILS_ENV=production to crontab clearing	Dimitar Dimitrov	2015-09-30	1	-1/+1
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	All other commands in the guide set this env var, but it's missing here and this causes whenever not to clear the crontab file of gitab_ci properly.