summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove unnecesary time_tracking_bundle.js filemr-widget-redesign-reviewAlfredo Sumaran2017-05-071-66/+0
|
* Add @javascript on spinach testOswaldo Ferreira2017-05-071-0/+1
|
* Add @javascript and extra wait_for_vue_resourceOswaldo Ferreira2017-05-072-0/+4
|
* Return 0 if no window.activeVueResourcesOswaldo Ferreira2017-05-071-1/+1
|
* Adjust typoOswaldo Ferreira2017-05-071-2/+2
|
* Improve request blocker middleware to support Vue requestsOswaldo Ferreira2017-05-073-7/+23
|
* Apply wait_for_vue_resource [2]Oswaldo Ferreira2017-05-073-0/+11
|
* Testing: Commenting after hook for waiting complete requestOswaldo Ferreira2017-05-071-6/+6
|
* Update MR json schemaOswaldo Ferreira2017-05-071-2/+2
|
* Add wait_for_vue_resource where its neededOswaldo Ferreira2017-05-072-6/+10
|
* MRWidget: Fix Spinach spec.Fatih Acet2017-05-061-0/+1
|
* MRWidget: Backport EE changes.Fatih Acet2017-05-0611-21/+46
|
* Add wait_for_vue_resource for MR requests spinach testsOswaldo Ferreira2017-05-062-1/+10
|
* EE backportOswaldo Ferreira2017-05-065-32/+22
|
* Fix rspec failure for award slash commandskushalpandya2017-05-061-4/+0
|
* Merge request widget redesignDmitriy Zaporozhets2017-05-06181-1533/+7009
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'fix-routable-find-by-full-path-on-mysql' into 'master' Sean McGivern2017-05-061-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-mysqlSean McGivern2017-05-061-1/+1
| |
* | Merge branch '23751-add-contribution-graph-key-tooltips' into 'master' Filipa Lacerda2017-05-062-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-tooltipsMike Greiling2017-05-051-0/+4
| |
| * add tooltips to user contrib graph keyMike Greiling2017-05-051-9/+17
| |
* | Merge branch '17361-redirect-renamed-paths' into 'master' Sean McGivern2017-05-0636-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-pathsMichael Kozono2017-05-052-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 discussionsMichael Kozono2017-05-052-7/+6
| |
| * Resolve discussionsMichael Kozono2017-05-058-25/+31
| |
| * Dry up routable lookups. Fixes #30317Michael Kozono2017-05-055-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 redirectMichael Kozono2017-05-054-0/+9
| |
| * Resolve discussionsMichael Kozono2017-05-055-23/+42
| |
| * Fix Rubocop failuresMichael Kozono2017-05-053-7/+6
| |
| * Index redirect_routes path for LIKEMichael Kozono2017-05-053-0/+31
| |
| * Add index for source association and for pathMichael Kozono2017-05-052-1/+26
| |
| * Fix or workaround spec failureMichael Kozono2017-05-051-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" ```
| * RefactorMichael Kozono2017-05-052-9/+9
| |
| * Delete conflicting redirectsMichael Kozono2017-05-054-20/+127
| |
| * Create redirect routes on path changeMichael Kozono2017-05-052-8/+50
| |
| * Redirect from redirect routes to canonical routesMichael Kozono2017-05-0530-87/+668
| |
| * Add happy path feature tests for redirect behaviorMichael Kozono2017-05-053-28/+255
| |
* | Merge branch 'use-absolute-path-for-gettext-config' into 'master' Stan Hu2017-05-061-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-configRuben Davila2017-05-051-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 Hu2017-05-061-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-againLuke "Jared" Bennett2017-05-051-1/+1
| | | | | | | | | | | | | | | | always hit
* | | | Merge branch 'fix/fork-spec-mysql' into 'master' Stan Hu2017-05-061-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-mysqlJames Lopez2017-05-051-0/+2
| |/ /
* | | Merge branch 'winh-visual-token-labels' into 'master' Jacob Schatz2017-05-0514-7/+431
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Colorize labels in issue search field Closes #30467 See merge request !11047
| * | | Colorize labels in issue search fieldWinnie Hellmann2017-05-0514-7/+431
|/ / /
* | | Merge branch ↵Sean McGivern2017-05-0516-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-ceAlejandro Rodríguez2017-05-056-6/+32
| | | |
| * | | Allow gl-repository strings as project identifiers in PostReceive workerAlejandro Rodríguez2017-05-053-50/+53
| | | |
| * | | Generate and handle a gl_repository param to pass around componentsAlejandro Rodríguez2017-05-0310-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 Ho2017-05-051-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Include droplab-item-ignore in droplab docs See merge request !10808
View Lorry Controller Status