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

	Commit message (Collapse)	Author	Age	Files	Lines
*	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
\| \|/
* \|	Merge branch 'project-header-titles' into 'master'	Dmitriy Zaporozhets	2015-09-18	66	-55/+107
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Project header titles Fixes my issues with !1293, see [my comment](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1293#note_2112289): > No please, not this huge if/else statement again! This will get out of sync so quickly, like happened with the original page titles before the page_title helper per page :( cc @haynes See merge request !1328
\| * \	Merge branch 'master' into project-header-titles	Douwe Maan	2015-09-18	22	-253/+87
\| \|\ \ \| \| \|/
\| * \|	"Back to x" links are lowercase.project-header-titles	Douwe Maan	2015-09-17	1	-1/+1
\| \| \|
\| * \|	Fix active state of CI Help nav link.	Douwe Maan	2015-09-17	1	-1/+1
\| \| \|
\| * \|	Rename "CI" in sidebar to "GitLab CI".	Douwe Maan	2015-09-17	1	-1/+1
\| \| \|
\| * \|	Move project header title definition to view in question.	Douwe Maan	2015-09-17	64	-53/+103
\| \| \|
* \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-09-18	8	-95/+93
\|\ \ \
\| * \ \	Merge branch 'ci_projects_order' into 'master'	Valery Sizov	2015-09-18	8	-95/+93
\| \|\ \ \ \| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix: ci projects order https://gitlab.com/gitlab-org/gitlab-ce/issues/2553 See merge request !1333
\| \| * \|	Fix: ci projects orderci_projects_order	Valery Sizov	2015-09-17	8	-95/+93
\| \| \| \|
* \| \| \|	Merge branch 'global-key' into 'master'	Job van der Voort	2015-09-17	1	-0/+2
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Note about global keys Because of tweet https://twitter.com/ChoboIslah/status/639565184806309888 See merge request !1931
\| * \| \|	fixed text	karen Carias	2015-09-17	1	-2/+1
\| \| \| \|
\| * \| \|	note about global keys	karen Carias	2015-09-13	1	-0/+3
\| \| \| \|
* \| \| \|	Merge branch 'remove-ci-help' into 'master'	Kamil Trzciński	2015-09-17	4	-80/+0
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove CI help Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/2556 See merge request !1325
\| * \| \| \|	Remove CI help	Kamil Trzcinski	2015-09-17	4	-80/+0
\| \| \| \| \|
* \| \| \| \|	Merge branch 'refactor-blob-upload-locals' into 'master'	Dmitriy Zaporozhets	2015-09-17	4	-18/+11
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move partial locals out of controller Some minor cleanup for upload/replace functionality: move controller variables into partial locals. See merge request !1331
\| * \| \| \|	Move partial locals out of controller	Stan Hu	2015-09-17	4	-18/+11
\|/ / / /
* \| \| \|	Merge pull request #9618 from pjknkda/repo-info-to-issue-hook	Stan Hu	2015-09-17	4	-0/+29
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	add repository field to issue hook data
\| * \| \| \|	add repository field to issue hook data	Jungkook Park	2015-09-17	4	-0/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add a test for to_hook_data of issue model update CHANGELOG
* \| \| \| \|	Merge branch 'ci-nav-changes' into 'master'	Dmitriy Zaporozhets	2015-09-17	8	-143/+25
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Integrate CI navigation more tightly with project ![Screen_Shot_2015-09-17_at_09.51.56](https://gitlab.com/gitlab-org/gitlab-ce/uploads/013807ad9f89a35a4af988199c2ee92f/Screen_Shot_2015-09-17_at_09.51.56.png) ![Screen_Shot_2015-09-17_at_09.52.14](https://gitlab.com/gitlab-org/gitlab-ce/uploads/8f9bdaafeef62fa451ee3699f003cbc4/Screen_Shot_2015-09-17_at_09.52.14.png) ![Screen_Shot_2015-09-17_at_09.52.07](https://gitlab.com/gitlab-org/gitlab-ce/uploads/cb726bf0651ddb74c10fd7bae9a333fb/Screen_Shot_2015-09-17_at_09.52.07.png) /cc @dzaporozhets See merge request !1324
\| * \| \| \| \|	Fix nav_link for dashboard	Kamil Trzcinski	2015-09-17	1	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Remove duplicate code	Kamil Trzcinski	2015-09-17	1	-108/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Check current_controller against controller_path	Kamil Trzcinski	2015-09-17	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The controller_path includes namespaces, where controller_name only includes the class name without controller
\| * \| \| \| \|	Integrate CI navigation more tightly with project	Kamil Trzcinski	2015-09-17	6	-34/+22
\|/ / / / /
* \| \| \| \|	Merge branch 'fix-schema-downgrade' into 'master'	Kamil Trzciński	2015-09-17	1	-1/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix schema downgrade introduced by: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1299 Fixes: https://dev.gitlab.org/ci/projects/1/refs/master/commits/2e9a7032cec02588484eb162717298d311770c7d Introduced by: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1299 See merge request !1326
\| * \| \| \| \|	Fix schema downgrade introduced by: ↵fix-schema-downgrade	Kamil Trzcinski	2015-09-17	1	-1/+2
\| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1299
* \| \| \| \|	Merge branch 'ci-whenever-clear' into 'master'	Kamil Trzciński	2015-09-17	1	-11/+18
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove CI cronjob during migration See merge request !1329
\| * \| \| \|	Remove CI cronjob during migrationci-whenever-clear	Jacob Vosmaer	2015-09-17	1	-11/+18
\|/ / / /
* \| \| \|	Merge branch 'fix-issue-2382' into 'master'	Stan Hu	2015-09-17	12	-14/+83
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create a "destroyed Milestone" event and keep Milestone events around in the DB for posterity Also fix issue where destroying a Milestone would cause odd, transient messages like "created milestone" or "imported milestone". Now if a milestone is destroyed, at least it will indicate in the activity feed even if it's not clear which milestone was destroyed: ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c89cc8a0a9fa549deac433f17b890913/image.png) Closes #2382 See merge request !1227
\| * \| \|	Create a "destroyed Milestone" event and keep Milestone events around in the DB	Stan Hu	2015-09-15	12	-14/+83
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	for posterity. Also fix issue where destroying a Milestone would cause odd, transient messages like "created milestone" or "imported milestone". Add "in" preposition when creating and destroying milestones Closes #2382
* \| \| \|	Merge branch 'enable_ssl_by_default' into 'master'	Valery Sizov	2015-09-17	4	-4/+16
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable SSL by default https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1135 See merge request !1299
\| * \| \| \|	enable SSL by defaultenable_ssl_by_default	Valery Sizov	2015-09-17	4	-4/+16
\| \| \| \| \|
* \| \| \| \|	Merge branch 'fix-ci-500-on-settings' into 'master'	Dmitriy Zaporozhets	2015-09-17	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix 500 on CI project settings Fix: https://gitlab.com/gitlab-org/gitlab-ce/issues/2546 /cc @dzaporozhets See merge request !1321
\| * \| \| \| \|	Fix 500 on CI project settingsfix-ci-500-on-settings	Kamil Trzcinski	2015-09-16	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'fix-public-projects' into 'master'	Dmitriy Zaporozhets	2015-09-17	1	-5/+0
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix displaying public projects Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/2552 See merge request !1318
\| * \| \| \| \| \|	Fix displaying public projectsfix-public-projects	Kamil Trzcinski	2015-09-16	1	-5/+0
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'restrict-user-api-integers' into 'master'	Dmitriy Zaporozhets	2015-09-17	3	-1/+58
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Restrict users API endpoints to use integer IDs Closes #2267 See merge request !1156
\| * \| \| \| \| \| \|	Restrict users API endpoints to use integer IDs	Stan Hu	2015-08-23	3	-1/+58
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #2267
* \| \| \| \| \| \| \|	Merge branch 'fix-gh-issue-9640' into 'master'	Dmitriy Zaporozhets	2015-09-17	2	-1/+2
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix HTML link that was improperly escaped in new user e-mail ### Before: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/e42e73f04971d8dd949b034846d2bb9f/image.png) ### After: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/90425911345031a4b8e9374323728f79/image.png) Closes https://github.com/gitlabhq/gitlabhq/issues/9640 See merge request !1323
\| * \| \| \| \| \| \|	Fix HTML link that was improperly escaped in new user e-mail	Stan Hu	2015-09-16	2	-1/+2
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://github.com/gitlabhq/gitlabhq/issues/9640
* \| \| \| \| \| \|	Merge branch 'update-mailroom' into 'master'	Robert Speicher	2015-09-16	2	-3/+3
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	See merge request !1306