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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \|	Merge branch 'reply-by-email-diff' into 'master'	Robert Speicher	2015-09-21	5	-7/+24
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix reply by email for comments on a specific line in a diff/commit. Fixes #2363. See merge request !1364
\| * \| \| \| \| \| \|	Fix reply by email for comments on a specific line in a diff/commit.reply-by-email-diff	Douwe Maan	2015-09-20	5	-7/+24
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'gmail_actions_doc' into 'master'	Job van der Voort	2015-09-20	3	-1/+23
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Gmail actions button for GitLab doc. Resolves #1517 by adding doc with some notes. See merge request !1327
\| * \| \| \| \| \| \|	Update the link in integration readme.gmail_actions_doc	Marin Jankovski	2015-09-17	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Remove double png.	Marin Jankovski	2015-09-17	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add Gmail actions button for GitLab doc.	Marin Jankovski	2015-09-17	2	-0/+22
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'fix-ci-link-on-project-page' into 'master'	Kamil Trzciński	2015-09-20	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix 500 when showing project page and there's no CI project present This fixes 500 when: 1. GitLabCiService is active 2. There's no project in ci_projects table See merge request !1338
\| * \| \| \| \| \| \|	Fix 500 when showing project page and there's no CI project presentfix-ci-link-on-project-page	Kamil Trzcinski	2015-09-18	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'style-pagination' into 'master'	Dmitriy Zaporozhets	2015-09-20	4	-10/+43
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Apply new design to pagination Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @skyruler See merge request !1362
\| * \| \| \| \| \| \| \|	Apply new design to paginationstyle-pagination	Dmitriy Zaporozhets	2015-09-19	4	-10/+43
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \|	Merge branch 'ci-build-list' into 'master'	Dmitriy Zaporozhets	2015-09-20	13	-144/+180
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Style CI project/build list * return `bs-callout` css class to fix few UI issues * refactor build status helpers * style CI project page (#2545) * style build page by re-using existing UI components * style CI commit page by re-using existing UI components Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1339
\| * \| \| \| \| \| \| \|	Cleanup GitLab CI UIci-build-list	Dmitriy Zaporozhets	2015-09-19	12	-162/+132
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \|	Return callout css for CI	Dmitriy Zaporozhets	2015-09-19	1	-0/+45
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \|	Merge branch 'master' into ci-build-list	Dmitriy Zaporozhets	2015-09-19	40	-387/+109
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / /
\| * \| \| \| \| \| \| \|	Add colors to build labels	Dmitriy Zaporozhets	2015-09-18	5	-13/+57
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \|	Merge branch 'master' into ci-build-list	Dmitriy Zaporozhets	2015-09-18	87	-171/+227
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \| \|	Style CI project/build list	Dmitriy Zaporozhets	2015-09-18	11	-46/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \| \|	Merge branch 'jwt' into 'master'	Douwe Maan	2015-09-20	2	-4/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed format validation What does this MR do? Removals format validation for drone token Are there points in the code the reviewer needs to double check? Nothing Why was this MR needed? because drone migrated to JWT tokens and JWT token doesn't valid with current format ( i don't know how many symbols JWT can use for this ) See merge request !1359
\| * \| \| \| \| \| \| \| \| \|	Removed format validation	Kirilll Zaitsev	2015-09-19	2	-4/+1
\| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'rs-bump-two-factor' into 'master'	Douwe Maan	2015-09-20	11	-21/+32
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump devise-two-factor to 2.0.0 Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2605 See https://github.com/tinfoil/devise-two-factor/pull/43 See merge request !1363
\| * \| \| \| \| \| \| \| \| \|	Bump devise-two-factor to 2.0.0rs-bump-two-factor	Robert Speicher	2015-09-19	7	-11/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2605 See https://github.com/tinfoil/devise-two-factor/pull/43
\| * \| \| \| \| \| \| \| \| \|	Devise 3.5.x deprecates `confirm!` in favor of `confirm`	Robert Speicher	2015-09-19	4	-6/+6
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Bump devise to 3.5.2	Robert Speicher	2015-09-19	2	-4/+10
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Robert Schilling	2015-09-20	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \	Merge pull request #9646 from sameersbn/fix-link-to-docs	Robert Schilling	2015-09-20	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|	fixes link to reply_by_email docs
\| \| * \| \| \| \| \| \| \| \|	fixes link to reply_by_email docs	Sameer Naik	2015-09-20	1	-1/+1
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'fix-failing-migration' into 'master'	Robert Speicher	2015-09-19	2	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix failing migration on mysql We didn't specify that the db user needs the right to create temporary tables before. That's why the migration will fail on most installations that installed gitlab according to our documentation. This MR removes the "TEMPORARY" from the migration and changes the documentation to include the necessary rights for the future. Fixes #2590 See merge request !1351
\| * \| \| \| \| \| \| \| \|	fix failing migration on mysql	Hannes Rosenögger	2015-09-18	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We didn't specify that the db user needs the right to create temporary tables before. That's why the migration will fail on most installations. This commits removes the "TEMPORARY" from the migration and changes the documentation to include the necessary rights for the future.
* \| \| \| \| \| \| \| \| \|	Merge branch 'rs-issue-2597' into 'master'	Robert Speicher	2015-09-18	1	-4/+5
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix IssuableContext javascript We were calling `affix` before the events were bound so they never triggered correctly. Closes #2597 See merge request !1356
\| * \| \| \| \| \| \| \| \|	Fix IssuableContext javascript	Robert Speicher	2015-09-18	1	-4/+5
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We were calling `affix` before the events were bound so they never triggered correctly. Closes #2597
* \| \| \| \| \| \| \| \|	Merge branch 'ci_closer_integration' into 'master'	Kamil Trzciński	2015-09-18	22	-297/+31
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove API calls CE->CI See merge request !1307
\| * \| \| \| \| \| \| \|	remove API calls from CE to CIci_closer_integration	Valery Sizov	2015-09-18	22	-297/+31
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Fix gitlab ci projects page UI	Dmitriy Zaporozhets	2015-09-18	1	-9/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \|	Merge branch 'fix-doc-typo' into 'master'	Robert Speicher	2015-09-18	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in Reply by email docs See merge request !1346
\| * \| \| \| \| \| \| \|	Fix typo in Reply by email docsfix-doc-typo	Douwe Maan	2015-09-18	1	-2/+2
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'merge_request_error' into 'master'	Dmitriy Zaporozhets	2015-09-18	5	-75/+13
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix CI status in the MR page https://gitlab.com/gitlab-org/gitlab-ce/issues/2587 See merge request !1347
\| * \| \| \| \| \| \|	Fix CI status in the MR page	Valery Sizov	2015-09-18	5	-75/+13
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'pg_dump_schema' into 'master'	Dmitriy Zaporozhets	2015-09-18	4	-2/+9
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add pg_schema to backup config https://dev.gitlab.org/gitlab/gitlabhq/issues/2489 See merge request !1345
\| * \| \| \| \| \| \|	add pg_schema to backup configpg_dump_schema	Valery Sizov	2015-09-18	4	-2/+9
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'allow-to-disable-ci' into 'master'	Dmitriy Zaporozhets	2015-09-18	14	-7/+49
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow to disable GitLab CI Added simple config option to disable GitLab CI It makes all CI related requests to return 404 /cc @dzaporozhets @jacobvosmaer @vsizov See merge request !1340
\| * \| \| \| \| \|	Use 400 to notify that CI API is disabledallow-to-disable-ci	Kamil Trzcinski	2015-09-18	1	-1/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Allow to disable GitLab CI	Kamil Trzcinski	2015-09-18	14	-7/+47
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'add-custom-text-to-help' into 'master'	Jeroen van Baarsen	2015-09-18	7	-0/+17
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow custom info to be added to Help page Fixes #2536 Admin screen ![image](https://gitlab.com/jeroenvanbaarsen/gitlab-ce/uploads/e62f3e0ff40558fb955f09e469293521/image.png) Text on the Help page ![image](https://gitlab.com/jeroenvanbaarsen/gitlab-ce/uploads/ba315fb418e1698d8f44b88c7cc6c29a/image.png) /cc @DouweM See merge request !1309
\| * \| \| \| \| \|	Allow custom info to be added to Help page	Jeroen van Baarsen	2015-09-18	7	-0/+17
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #2536 Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* \| \| \| \| \|	Merge branch 'fix-ci-non-public-project' into 'master'	Dmitriy Zaporozhets	2015-09-18	2	-6/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix 500 when accessing private project when not logged in See merge request !1336
\| * \| \| \| \| \|	Fix 500 when accessing private project when not logged infix-ci-non-public-project	Kamil Trzcinski	2015-09-17	2	-6/+1
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'fix-trending-projects' into 'master'	Dmitriy Zaporozhets	2015-09-18	2	-14/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix 500 on trending projects if isntance has 100k+ projects Fixes #2576 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1341
\| * \| \| \| \| \|	Fix 500 on trending projects if isntance has 100k+ projects	Dmitriy Zaporozhets	2015-09-18	2	-14/+5
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \|	Merge branch 'fix-ci-settings-cancel' into 'master'	Dmitriy Zaporozhets	2015-09-18	1	-1/+0
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove Cancel button from CI Project settings Resolves https://gitlab.com/gitlab-org/gitlab-ce/issues/2568 See merge request !1337
\| * \| \| \| \| \|	Remove Cancel button in Project settingsfix-ci-settings-cancel	Kamil Trzcinski	2015-09-17	1	-1/+0
\| \|/ / / / /