summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Include blob content when printing page31781-print-rendered-files-not-possibleSam Rose2017-05-102-3/+9
|
* Merge branch 'issue-boards-sidebar-create-new-label-404-error' into 'master' Filipa Lacerda2017-05-103-1/+50
|\ | | | | | | | | | | | | Fixed create label form not working on issue boards in a sub-group project Closes #31862 See merge request !11182
| * Fixed create label form not working on issue boards in a sub-group projectissue-boards-sidebar-create-new-label-404-errorPhil Hughes2017-05-083-1/+50
| | | | | | | | Closes #31862
* | Merge branch 'use_relative_path_for_project_avatars' into 'master' Douwe Maan2017-05-1017-44/+107
|\ \ | | | | | | | | | | | | | | | | | | Use relative paths for group/project/user avatars Closes #13418 and #19662 See merge request !11001
| * | Use relative paths for group/project/user avatarsblackst0ne2017-05-1017-44/+107
| | |
* | | Merge branch 'patch-5' into 'master' Douwe Maan2017-05-101-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update tree_helper.rb to fix #31784, which broken file browse where paths deeper than 6:'/'. Closes #31784 See merge request !11197
| * | | update yield to return string pathzzjin2017-05-101-1/+1
| | | |
| * | | Update tree_helper.rb to fix #31784, which broken file browse where paths ↵zzjin2017-05-091-1/+1
| | | | | | | | | | | | | | | | deeper than 6:'/'.
* | | | Merge branch '20517-delete-projects-issuescontroller-redirect_old' into ↵Dmitriy Zaporozhets2017-05-102-16/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Delete `Projects::IssuesController#redirect_old`" Closes #20517 See merge request !11135
| * | | | Remove redirect for old issue url containing id instead of iidblackst0ne2017-05-102-16/+5
| | | | |
* | | | | Merge branch '32074-failed-build' into 'master' Phil Hughes2017-05-102-102/+233
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken test - load correct data Closes #32074 See merge request !11237
| * | | | | Fix broken test - load correct data32074-failed-buildFilipa Lacerda2017-05-102-102/+233
|/ / / / /
* | | | | Merge branch '31349-pipelines-vue' into 'master' Phil Hughes2017-05-105-31/+34
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use vue file for table pagination component Closes #31349 See merge request !11210
| * | | | | Use vue file for table pagination componentFilipa Lacerda2017-05-105-31/+34
|/ / / / /
* | | | | Merge branch 'tc-fix-openid-sign-in-at-again' into 'master' Robert Speicher2017-05-103-6/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Spec fix: Add :redis keyword to some specs clear state of trackable attributes Closes #32041 See merge request !11221
| * | | | | Revert "Fix OpenID spec failure that assumed current_sign_in_at would be set"tc-fix-openid-sign-in-at-againToon Claes2017-05-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 73f448e589f46865140412754a9c97df52dc16c7.
| * | | | | Add :redis keyword to some specs clear state of trackable attributesToon Claes2017-05-093-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The specs that rely on a correct value of the trackable attributes, should include the `:redis` keyword in the spec to ensure the state is reset between various specs. The trackable attributes being: - sign_in_count : Increased every time a sign in is made (by form, openid, oauth) - current_sign_in_at : A timestamp updated when the user signs in - last_sign_in_at : Holds the timestamp of the previous sign in - current_sign_in_ip : The remote ip updated when the user sign in - last_sign_in_ip : Holds the remote ip of the previous sign in The limiting of writing trackable attributes was introduced in gitlab-org/gitlab-ce!11053.
* | | | | | Merge branch ↵Clement Ho2017-05-105-8/+33
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '32030-transient-failure-in-spec-features-boards-boards_spec-rb' into 'master' Fix transient job failures relating to "unhandled Promise rejection" in issue boards Closes #32030 See merge request !11222
| * | | | | | stub error handlers where uncaught Promise rejections currently exist32030-transient-failure-in-spec-features-boards-boards_spec-rbMike Greiling2017-05-095-8/+33
| |/ / / / /
* | | | | | Merge branch '31053-pipeline-ux' into 'master' Fatih Acet2017-05-095-4/+114
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds left connector class to the rendered graph Closes #31053 See merge request !11179
| * \ \ \ \ \ Merge branch 'master' into 31053-pipeline-ux31053-pipeline-uxFilipa Lacerda2017-05-09205-1562/+7156
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Fallback to default pattern when note does not belong to project Merge request widget redesign Fixed focused test in notes spec Fixed UP arrow key not editing last comment in discussion Fix skipped manual actions issue in pipeline processing Fix notify_only_default_branch check for Slack service
| * \ \ \ \ \ \ Merge branch 'master' into 31053-pipeline-uxFilipa Lacerda2017-05-0812-28/+343
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Update guides for 9.2. [skip ci] add documentation Standardize jasmine test describe block names that test specific methods
| * | | | | | | Adds left connector class to the rendered graphFilipa Lacerda2017-05-085-4/+114
| | | | | | | |
* | | | | | | | Merge branch '32021-job-component-test-failure' into 'master' Fatih Acet2017-05-091-28/+46
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix test failure in job vue componenFix test failure in job vue componentt Closes #32021 See merge request !11208
| * | | | | | | Fix test failure in job vue componenFix test failure in job vue componentt32021-job-component-test-failureFilipa Lacerda2017-05-091-28/+46
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'dm-tree-blob-blame-consistency' into 'master' Fatih Acet2017-05-0916-69/+82
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make tree, blob and blame pages more consistent See merge request !11194
| * | | | | | | Add Repository subnav to 'Find files'dm-tree-blob-blame-consistencyDouwe Maan2017-05-091-0/+1
| | | | | | | |
| * | | | | | | Make tree, blob and blame pages more consistentDouwe Maan2017-05-0915-69/+81
| | | | | | | |
* | | | | | | | Merge branch 'winh-german-cycle-analytics' into 'master' Douwe Maan2017-05-093-70/+74
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Add German translation for Cycle Analytics See merge request !11161
| * | | | | | | Add German translation for Cycle Analytics (!11161)winh2017-05-093-70/+74
| | | | | | | |
* | | | | | | | Merge branch 'sh-fix-openid-spec-failure' into 'master' bj-blank-state-issues-list-bugRobert Speicher2017-05-091-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix OpenID spec failure that assumed current_sign_in_at would be set Closes #32041 See merge request !11219
| * | | | | | | | Fix OpenID spec failure that assumed current_sign_in_at would be setStan Hu2017-05-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to 6a915d6f, the `current_sign_in_at` may not actually be set due to an ExclusiveLease in other jobs. To fix this spec, manually set the value in the setup. Closes #32041
* | | | | | | | | Merge branch 'remove-needless-bind-polyfills' into 'master' Filipa Lacerda2017-05-0924-119/+75
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove needless bind and indexOf polyfills See merge request !11187
| * | | | | | | | | remove unnecessary indexOf polyfillsremove-needless-bind-polyfillsMike Greiling2017-05-083-9/+6
| | | | | | | | | |
| * | | | | | | | | remove bind polyfill from mock_u2f_device.jsMike Greiling2017-05-081-4/+2
| | | | | | | | | |
| * | | | | | | | | remove bind polyfill from users/calendar.jsMike Greiling2017-05-081-3/+1
| | | | | | | | | |
| * | | | | | | | | remove bind polyfill from users_select.jsMike Greiling2017-05-081-4/+3
| | | | | | | | | |
| * | | | | | | | | remove bind polyfill from u2f/register.jsMike Greiling2017-05-081-10/+8
| | | | | | | | | |
| * | | | | | | | | remove bind polyfill from u2f/error.jsMike Greiling2017-05-081-3/+1
| | | | | | | | | |
| * | | | | | | | | remove bind polyfill from u2f/authenticate.jsMike Greiling2017-05-081-9/+7
| | | | | | | | | |
| * | | | | | | | | remove bind polyfill from single_file_diff.jsMike Greiling2017-05-081-3/+1
| | | | | | | | | |
| * | | | | | | | | remove bind polyfill from shortcuts.jsMike Greiling2017-05-081-3/+1
| | | | | | | | | |
| * | | | | | | | | remove bind polyfill from right_sidebar.jsMike Greiling2017-05-081-3/+1
| | | | | | | | | |
| * | | | | | | | | remove bind polyfill from project_new.jsMike Greiling2017-05-081-3/+1
| | | | | | | | | |
| * | | | | | | | | remove bind polyfill from project_find_file.jsMike Greiling2017-05-081-6/+4
| | | | | | | | | |
| * | | | | | | | | remove bind polyfill from notifications_form.jsMike Greiling2017-05-081-3/+1
| | | | | | | | | |
| * | | | | | | | | remove bind polyfill from notes.jsMike Greiling2017-05-081-20/+18
| | | | | | | | | |
| * | | | | | | | | remove bind polyfill from new_commit_form.jsMike Greiling2017-05-081-3/+1
| | | | | | | | | |
| * | | | | | | | | remove bind polyfill from new_branch_form.jsMike Greiling2017-05-081-3/+2
| | | | | | | | | |
| * | | | | | | | | remove bind polyfill from namespace_select.jsMike Greiling2017-05-081-3/+1
| | | | | | | | | |