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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'typos_in_ci_doc' into 'master'	Robert Schilling	2016-04-16	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix typos in CI docs. See merge request !3709
\| *	Fix typos in CI docs.	Hyunwoo Jung	2016-04-13	1	-1/+1
\| \|
* \|	Merge branch 'master' of https://github.com/gitlabhq/gitlabhq	Jacob Vosmaer	2016-04-15	1	-1/+1
\|\ \
\| * \|	fix required gitlab-shell version.	lurdan	2016-04-15	1	-1/+1
\| \| \| \| \| \| \| \| \|	Under the procedure, I've warned about gitlab-shell version, which should be 2.6.12 (may be some minor revisions introduces that).
* \| \|	Merge branch 'patch-1' into 'master'	Robert Speicher	2016-04-14	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	change "very demand" to "specific demand" in CI runner docs [ci skip] See merge request !3726
\| * \| \|	change: "very demand" changed to "specific demand"	Jamie Neubert Pedersen	2016-04-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	This must be an error as the sentence doesn't make sense otherwise
* \| \| \|	Merge branch 'auto-fsck' into 'master'	Robert Speicher	2016-04-14	2	-0/+44
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Auto git fsck Closes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3232 See merge request !3232
\| * \| \|	Documentation / help improvements	Jacob Vosmaer	2016-04-14	2	-4/+4
\| \| \| \|
\| * \| \|	Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsck	Jacob Vosmaer	2016-04-13	16	-13/+356
\| \|\ \ \
\| * \| \| \|	Remove \f. WT\F ??	Jacob Vosmaer	2016-04-13	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Improve English, thanks Robert	Jacob Vosmaer	2016-04-13	1	-3/+3
\| \| \| \| \|
\| * \| \| \|	Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsck	Jacob Vosmaer	2016-04-12	25	-81/+640
\| \|\ \ \ \
\| * \| \| \| \|	Move 'clear checks' button to applicatoin settings	Jacob Vosmaer	2016-04-12	1	-22/+11
\| \| \| \| \| \|
\| * \| \| \| \|	Rename almost all the things	Jacob Vosmaer	2016-04-06	1	-9/+9
\| \| \| \| \| \|
\| * \| \| \| \|	Document how to disable repo checks	Jacob Vosmaer	2016-04-06	1	-0/+16
\| \| \| \| \| \|
\| * \| \| \| \|	Rebase repo check MR	Jacob Vosmaer	2016-04-04	1	-0/+39
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'rake-db-reset' into 'master'	Robert Speicher	2016-04-14	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use rake db:reset instead of db:setup See merge request !3721
\| * \| \| \| \| \|	Use rake db:reset instead of db:setup	Yorick Peterse	2016-04-14	1	-1/+1
\| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Using db:reset ensures existing tables are first dropped. This in turn ensures that we can drop tables regardless of any foreign key constraints. While CE currently doesn't have any foreign keys EE defines the following relation: remote_mirrors.project_id -> projects.id MySQL will complain whenever you try to drop the "projects" table first even when using "DROP TABLE ... CASCADE".
* \| \| \| \| \|	Merge branch 'start-with-iid-on-new-branch' into 'master'	Rémy Coutable	2016-04-14	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Start with iid on branch creation After the discussion it in #3886 it was decided the iid should be in the beginning of the branch name. See merge request !3708
\| * \| \| \| \| \|	Start with iid on branch creation	Zeger-Jan van de Weg	2016-04-14	1	-1/+1
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'master' into 'master'	Achilleas Pipinellis	2016-04-14	1	-0/+47
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update shibboleth configuration for GitLab 8.6 and Apache 2.4 See merge request !3713
\| * \| \| \| \| \|	Update shibboleth configuration for GitLab 8.6 and Apache 2.4	Tom Downes	2016-04-14	1	-0/+47
\| \|/ / / / /
* \| \| \| \| \|	Add TOC to yaml README and an intro section	Achilleas Pipinellis	2016-04-14	1	-16/+57
\| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \|	Allow back dating notes on creation	Michael Greene	2016-04-13	1	-0/+1
\| \| \| \| \|
* \| \| \| \|	Allow back dating issues on update	Michael Greene	2016-04-13	1	-0/+1
\|/ / / /
* \| \| \|	Merge branch 'update-influx-documentation' into 'master'	Achilleas Pipinellis	2016-04-13	1	-18/+30
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated InfluxDB/Grafana setup/import docs See https://gitlab.com/gitlab-org/grafana-dashboards/merge_requests/1 for some background info. cc @dblessing See merge request !3706
\| * \| \| \|	Updated InfluxDB/Grafana setup/import docs	Yorick Peterse	2016-04-13	1	-18/+30
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The grafana-dashboards repository now contains _all_ GitLab.com dashboards and thus requires some extra continuous queries to be set up. The repository now also provided a way to automatically import/export dashboards. [ci skip]
* \| \| \|	Merge branch 'api-subscribe-issue-mr' into 'master'	Rémy Coutable	2016-04-13	2	-0/+257
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: Subscribe and unsubscribe from issues and merge requests * Closes #6024 This MR is based on !3611, which must be merged first. See merge request !3615
\| * \| \|	Ensure that issues and merge requests are found	Robert Schilling	2016-04-13	1	-0/+1
\| \| \| \|
\| * \| \|	Make subscription API more RESTful	Robert Schilling	2016-04-13	2	-27/+28
\| \| \| \|
\| * \| \|	API: Ability to subscribe and unsubscribe from a merge request	Robert Schilling	2016-04-13	1	-0/+147
\| \| \| \|
\| * \| \|	API: Ability to subscribe and unsubscribe from an issue	Robert Schilling	2016-04-13	1	-0/+108
\| \| \| \|
* \| \| \|	Merge branch 'api-star-project' into 'master'	Rémy Coutable	2016-04-13	2	-0/+127
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: Star and unstar a project Add two new endpoints `POST /projects/:id/star` and `POST /projects/:id/unstar` to star and unstar a project. * Closes #12739 See merge request !3578
\| * \| \| \|	Styling changes to code and docs	Robert Schilling	2016-04-13	1	-1/+0
\| \| \| \| \|
\| * \| \| \|	Make staring API more restful	Robert Schilling	2016-04-13	1	-6/+6
\| \| \| \| \|
\| * \| \| \|	API: Star and unstar a project	Robert Schilling	2016-04-13	2	-0/+128
\| \|/ / /
* \| \| \|	Merge branch 'fix_grafana_docs' into 'master'	Achilleas Pipinellis	2016-04-13	4	-3/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Grafana docs and link from Influx page Fixing images and adding links to Influx docs, as suggested by @sytses See merge request !3702
\| * \| \| \|	Fix Grafana docs and link from Influx page	Drew Blessing	2016-04-12	4	-3/+6
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge branch 'external-omniauth-providers' into 'master'	Marin Jankovski	2016-04-13	1	-0/+23
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow Omniauth providers to be marked as external Related to #4009 With this MR we will be able to allow the user to set which Omniauth Providers they would like to have as external. All users login in via these providers will be marked as external, even if they already had an account before. If the provider is removed form the list of external providers, the users will be marked as internal at their next login. MR for Omnibus: gitlab-org/omnibus-gitlab!727 /cc @dblessing @DouweM See merge request !3657
\| * \| \| \|	Documentation of feature	Patricio Cano	2016-04-11	1	-0/+23
\| \| \| \| \|
* \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2016-04-13	11	-9/+386
\|\ \ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|
\| * \| \| \|	Merge branch 'api-move-issues' into 'master'	Rémy Coutable	2016-04-13	1	-0/+55
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: Ability to move an issue Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14741 See merge request !3593
\| \| * \| \| \|	Fix doc for moving an issue	Robert Schilling	2016-04-13	1	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Update tests for moving issues via API	Robert Schilling	2016-04-13	1	-2/+6
\| \| \| \| \| \|
\| \| * \| \| \|	API: Ability to move an issue	Robert Schilling	2016-04-13	1	-0/+51
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'patch-2' into 'master'	Robert Schilling	2016-04-13	1	-1/+1
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	improve formatting See merge request !3688
\| \| * \| \| \| \|	improve formatting	Ben Bodenmiller	2016-04-12	1	-1/+1
\| \| \| \|_\|/ / \| \| \|/\| \| \|
\| * \| \| \| \|	Merge branch 'configure_trusted_proxies' into 'master'	Rémy Coutable	2016-04-13	1	-0/+10
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adjust the default trusted_proxies to only include localhost And also allow other trusted proxies to be added from the config.yml. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3538 Omnibus config: https://gitlab.com/gitlab-org/omnibus-gitlab/issues/1208 See merge request !3524
\| \| * \| \| \| \|	Updated trusted proxies doc section to link to the restart GitLab docsconfigure_trusted_proxies	DJ Mountney	2016-04-12	1	-1/+2
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Add changelog entries, install docs, and gitlab.yml.example entry for the ↵	DJ Mountney	2016-04-12	1	-0/+9
\| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	trusted_proxies setting