summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | Merge branch '30949-empty-states' into 'master' Phil Hughes2017-05-106-28/+13
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Center all empty states Closes #30949 See merge request !11249
| | * | | | | | | | Center all empty statesAnnabel Dunstone Gray2017-05-106-28/+13
| |/ / / / / / / /
| * | | | | | | | Merge branch 'center-related-merge-request-items-horizontally' into 'master' Filipa Lacerda2017-05-101-1/+9
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Center related merge request items horizontally See merge request !11163
| | * | | | | | | | Added @annabeldunstone vertical-align fixcenter-related-merge-request-items-horizontallyLuke "Jared" Bennett2017-05-101-0/+8
| | | | | | | | | |
| | * | | | | | | | Remove related issue ci icon top marginLuke "Jared" Bennett2017-05-091-1/+0
| | | | | | | | | |
| | * | | | | | | | Center related merge request items horizontallyLuke "Jared" Bennett2017-05-081-0/+1
| | | | | | | | | |
| * | | | | | | | | Merge branch 'dm-discussion-diff-header-toggle' into 'master' Douwe Maan2017-05-102-2/+6
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused toggle from diff discussion diff headers See merge request !11192
| | * | | | | | | | | Remove unused toggle from diff discussion diff headersdm-discussion-diff-header-toggleDouwe Maan2017-05-092-2/+6
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'dm-async-tree-readme' into 'master' Douwe Maan2017-05-1015-16/+42
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Load tree readme asynchronously See merge request !11191
| | * | | | | | | | | Load tree readme asynchronouslydm-async-tree-readmeDouwe Maan2017-05-1015-16/+42
| | |/ / / / / / / /
* | | | | | | | | | Fixed tests on textarea looking for innerText instead of valuePhil Hughes2017-05-103-7/+6
| | | | | | | | | |
* | | | | | | | | | Fixed a bunch of errors with invalid propPhil Hughes2017-05-103-19/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use v-model on textrea
* | | | | | | | | | Added a bunch of specs for the different componentsPhil Hughes2017-05-104-28/+193
| | | | | | | | | |
* | | | | | | | | | Fixed task status with mobilePhil Hughes2017-05-101-5/+11
| | | | | | | | | |
* | | | | | | | | | Refactored issue tealtime elementsPhil Hughes2017-05-1010-225/+327
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to match our docs better and will also help a future issue. Also made it possible for the description & title to be readable when JS is disabled
* | | | | | | | | Merge branch 'remove-old-isobject' into 'master' Phil Hughes2017-05-1011-47/+18
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace old isObject for underscore methods Closes #30317 See merge request !11124
| * | | | | | | | | Replace old isObject for underscore methodsFilipa Lacerda2017-05-1011-47/+18
|/ / / / / / / / /
* | | | | | | | | Merge branch '30286-vue-loadin-icon' into 'master' Phil Hughes2017-05-1020-105/+187
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tech debt: Creates vue component for loading icon Closes #31328 See merge request !11167
| * | | | | | | | | Tech debt: Creates vue component for loading iconFilipa Lacerda2017-05-1020-105/+187
|/ / / / / / / / /
* | | | | | | | | Merge branch '31554-update-rufus-scheduler-and-sidekiq' into 'master' Rémy Coutable2017-05-105-9/+34
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Update gem sidekiq-cron from 0.4.4 to 0.6.0 and rufus-scheduler from 3.1.10 to 3.4.0" Closes #31554 See merge request !10976
| * | | | | | | | | Resolve "Update gem sidekiq-cron from 0.4.4 to 0.6.0 and rufus-scheduler ↵Dosuken shinya2017-05-105-9/+34
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | from 3.1.10 to 3.4.0"
* | | | | | | | | Merge branch '32077-pipeline-graph-margins' into 'master' Phil Hughes2017-05-101-5/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken margin in pipeline graph Closes #32077 See merge request !11239
| * | | | | | | | | Fix broken margin in pipeline graphFilipa Lacerda2017-05-101-5/+5
|/ / / / / / / / /
* | | | | | | | | Merge branch 'fix-reassigned-mr-email' into 'master' Douwe Maan2017-05-102-19/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix reassigned MR HTML email See merge request !11238
| * | | | | | | | | Fix reassigned MR emailfix-reassigned-mr-emailSean McGivern2017-05-102-19/+10
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'feature/print-go-version-in-env-info' into 'master' Sean McGivern2017-05-102-0/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Print Go version in rake gitlab:env:info See merge request !11241
| * | | | | | | | | Print Go version in rake gitlab:env:infofeature/print-go-version-in-env-infoAhmad Sherif2017-05-102-0/+7
| |/ / / / / / / /
* | | | | | | | | Merge branch 'fix-sidebar_spec-assignee-edit-transient-failure' into 'master' Sean McGivern2017-05-101-2/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Find dropdown-menu before asserting active item in sidebar_spec.rb See merge request !11246
| * | | | | | | | Find dropdown-menu before asserting active item in sidebar_spec.rbfix-sidebar_spec-assignee-edit-transient-failureLuke "Jared" Bennett2017-05-101-2/+2
| | | | | | | | |
* | | | | | | | | Merge branch 'search-restrict-projects-to-group' into 'master' Filipa Lacerda2017-05-104-9/+50
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Filter projects by group on search page Closes #29489 See merge request !11169
| * | | | | | | | | Filter projects by group on search pagesearch-restrict-projects-to-groupPhil Hughes2017-05-084-9/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After selecting a group, the projects dropdown will now filter by group projects instead Closes #29489
* | | | | | | | | | Merge branch 'fix-search-not-highlighting' into 'master' Filipa Lacerda2017-05-103-10/+47
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed search terms not highlight Closes #31997 See merge request !11198
| * | | | | | | | | | Fixed search terms not highlightPhil Hughes2017-05-103-10/+47
| | |_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #31997
* | | | | | | | | | 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