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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \| \|	Merge branch 'zj-real-time-pipelines' into 'master'	Kamil Trzciński	2017-05-06	17	-11/+637
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Real time pipeline show action Closes #25226 See merge request !10777
\| * \| \| \| \| \| \| \|	Real time pipeline show action	Zeger-Jan van de Weg	2017-05-06	17	-11/+637
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'fix-routable-find-by-full-path-on-mysql' into 'master'	Sean McGivern	2017-05-06	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix `Routable.find_by_full_path` on MySQL See merge request !11146
\| * \| \| \| \| \| \| \|	Fix `Routable.find_by_full_path` on MySQLfix-routable-find-by-full-path-on-mysql	Sean McGivern	2017-05-06	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '23751-add-contribution-graph-key-tooltips' into 'master'	Filipa Lacerda	2017-05-06	2	-9/+21
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add tooltips to user contribution graph key Closes #23751 See merge request !11138
\| * \| \| \| \| \| \| \|	add CHANGELOG.md entry for !1113823751-add-contribution-graph-key-tooltips	Mike Greiling	2017-05-05	1	-0/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	add tooltips to user contrib graph key	Mike Greiling	2017-05-05	1	-9/+17
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '17361-redirect-renamed-paths' into 'master'	Sean McGivern	2017-05-06	36	-162/+1207
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Redirect to new project link after a rename" Closes #17361 and #30317 See merge request !11136
\| * \| \| \| \| \| \| \|	Reduce risk of deadlocks17361-redirect-renamed-paths	Michael Kozono	2017-05-05	2	-21/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We’ve seen a deadlock in CI here https://gitlab.com/mkozono/gitlab-ce/builds/15644492#down-build-trace. This commit should not fix that particular failure, but perhaps it will avoid others. * Don’t call delete_conflicting_redirects after update if the path wasn’t changed * Rename descendants without using recursion again, so we can run delete_conflicting_redirects exactly once.
\| * \| \| \| \| \| \| \|	Resolve discussions	Michael Kozono	2017-05-05	2	-7/+6
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Resolve discussions	Michael Kozono	2017-05-05	8	-25/+31
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Dry up routable lookups. Fixes #30317	Michael Kozono	2017-05-05	5	-55/+58
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Note: This changes the behavior of user lookups (see the spec change) so it acts the same way as groups and projects. Unauthenticated clients attempting to access a user page will be redirected to login whether the user exists and is publicly restricted, or does not exist at all.
\| * \| \| \| \| \| \| \|	Add “project moved” flash message on redirect	Michael Kozono	2017-05-05	4	-0/+9
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Resolve discussions	Michael Kozono	2017-05-05	5	-23/+42
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix Rubocop failures	Michael Kozono	2017-05-05	3	-7/+6
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Index redirect_routes path for LIKE	Michael Kozono	2017-05-05	3	-0/+31
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add index for source association and for path	Michael Kozono	2017-05-05	2	-1/+26
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix or workaround spec failure	Michael Kozono	2017-05-05	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Not sure why this fixes this error: ``` ActiveRecord::RecordNotUnique: PG::UniqueViolation: ERROR: duplicate key value violates unique constraint "index_routes_on_source_type_and_source_id" DETAIL: Key (source_type, source_id)=(Project, 1) already exists. : INSERT INTO "routes" ("source_type", "path", "name", "source_id", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id" ```
\| * \| \| \| \| \| \| \|	Refactor	Michael Kozono	2017-05-05	2	-9/+9
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Delete conflicting redirects	Michael Kozono	2017-05-05	4	-20/+127
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Create redirect routes on path change	Michael Kozono	2017-05-05	2	-8/+50
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Redirect from redirect routes to canonical routes	Michael Kozono	2017-05-05	30	-87/+668
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add happy path feature tests for redirect behavior	Michael Kozono	2017-05-05	3	-28/+255
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'use-absolute-path-for-gettext-config' into 'master'	Stan Hu	2017-05-06	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use an absolute path for locale path in FastGettext config See merge request !11141
\| * \| \| \| \| \| \| \| \|	Use an absolute path for locale path in FastGettext configuse-absolute-path-for-gettext-config	Ruben Davila	2017-05-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Unicorn was unable to start due to this bad config on Omnibus.
* \| \| \| \| \| \| \| \| \|	Merge branch 'attemp-to-fix-issue_sidebar_spec-again' into 'master'	Stan Hu	2017-05-06	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Trigger click instead of actual click to make sure the right button is always hit Closes #30504 See merge request !11127
\| * \| \| \| \| \| \| \| \| \|	Trigger click instead of actual click to make sure the right button is ↵attemp-to-fix-issue_sidebar_spec-again	Luke "Jared" Bennett	2017-05-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	always hit
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix/fork-spec-mysql' into 'master'	Stan Hu	2017-05-06	1	-0/+2
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix fork_spec failure to do with mySQL Closes #31870 See merge request !11121
\| * \| \| \| \| \| \| \| \| \|	workaround spec failure for mySQL invalid date issuefix/fork-spec-mysql	James Lopez	2017-05-05	1	-0/+2
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'winh-visual-token-labels' into 'master'	Jacob Schatz	2017-05-05	14	-7/+431
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Colorize labels in issue search field Closes #30467 See merge request !11047
\| * \| \| \| \| \| \| \| \| \|	Colorize labels in issue search field	Winnie Hellmann	2017-05-05	14	-7/+431
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch ↵	Sean McGivern	2017-05-05	16	-140/+268
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'29925-gitlab-shell-hooks-can-no-longer-send-absolute-paths-to-gitlab-ce' into 'master' Generate and handle a gl_repository param to pass around components Closes #29925 See merge request !10992
\| * \| \| \| \| \| \| \| \| \|	Pass GL_REPOSITORY in Workhorse responses29925-gitlab-shell-hooks-can-no-longer-send-absolute-paths-to-gitlab-ce	Alejandro Rodríguez	2017-05-05	6	-6/+32
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Allow gl-repository strings as project identifiers in PostReceive worker	Alejandro Rodríguez	2017-05-05	3	-50/+53
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Generate and handle a gl_repository param to pass around components	Alejandro Rodríguez	2017-05-03	10	-85/+184
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This new param allows us to share project information between components that don't share or don't have access to the same filesystem mountpoints, for example between Gitaly and Rails or between Rails and Gitlab-Shell hooks. The previous parameters are still supported, but if found, gl_repository is prefered. The old parameters should be deprecated once all components support the new format.
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'droplab-item-ignore-docs' into 'master'	Clement Ho	2017-05-05	1	-0/+2
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Include droplab-item-ignore in droplab docs See merge request !10808
\| * \| \| \| \| \| \| \| \| \| \|	Include droplab-item-ignore in droplab docsdroplab-item-ignore-docs	Luke "Jared" Bennett	2017-04-20	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix/admin-integrations' into 'master'	Sean McGivern	2017-05-05	8	-0/+295
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix new admin integrations not taking effect on existing project Closes #26376 See merge request !11069
\| * \| \| \| \| \| \| \| \| \| \| \|	refactor code based on feedbackfix/admin-integrations	James Lopez	2017-05-05	3	-15/+17
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	refactor code based on feedback	James Lopez	2017-05-05	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	refactor code based on feedback	James Lopez	2017-05-05	8	-47/+34
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	add callbacks in bulk	James Lopez	2017-05-05	2	-6/+42
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	bulk insert FTW - This would introduce more complexity, but should be faster	James Lopez	2017-05-05	2	-7/+41
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	use select_values	James Lopez	2017-05-05	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	fixed all issues - not doing bulk create.	James Lopez	2017-05-05	2	-7/+15
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	refactor propagate service to use batch inserts and subquery instead of left ↵	James Lopez	2017-05-05	1	-6/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	join
\| * \| \| \| \| \| \| \| \| \| \| \|	refactor a few things based on feedback	James Lopez	2017-05-04	8	-48/+45
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	add more examples for testing SQL	James Lopez	2017-05-04	1	-0/+30
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	fix service spec	James Lopez	2017-05-04	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	fix service spec	James Lopez	2017-05-04	2	-6/+7
\| \| \| \| \| \| \| \| \| \| \| \| \|