summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* fixed paginationgroups-webpack-bundlePhil Hughes2018-01-231-3/+1
|
* fixed group page specific JSPhil Hughes2018-01-231-2/+0
|
* Added dispatcher imports for groups webpack bundlePhil Hughes2018-01-2310-11/+23
|
* Backport for Resolve "change status icon for reports when fails to be found ↵Filipa Lacerda2018-01-236-5/+8
| | | | or cannot load"
* Merge branch '42119-non-triggered' into 'master'Grzegorz Bizon2018-01-232-5/+10
|\ | | | | | | | | | | | | Resolve ""This job has not been triggered yet" after hitting "Retry"" Closes #42119 See merge request gitlab-org/gitlab-ce!16583
| * Improve copy for the pending state42119-non-triggeredFilipa Lacerda2018-01-221-1/+1
| |
| * Adds information for pending stateFilipa Lacerda2018-01-221-2/+7
| |
| * Do not render non triggered empty state for pending jobsFilipa Lacerda2018-01-192-5/+5
| | | | | | | | Put back non triggered information
* | Merge branch ↵Robert Speicher2018-01-221-0/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '40612-cannot-change-project-visibility-from-private-even-when-owner' into 'master' Resolve "Cannot change project visibility from Private (even when owner)" Closes #40612 See merge request gitlab-org/gitlab-ce!16595
| * | remove redundant forked? checkMike Greiling2018-01-221-1/+1
| | |
| * | ensure fork_source returns nil when project is the root fork, add testsMike Greiling2018-01-221-0/+2
| | |
| * | fix issue in which projects which have forks cannot be changed from private ↵Mike Greiling2018-01-191-1/+1
| | | | | | | | | | | | to public
* | | Merge branch 'fix-callback-alignments' into 'master'Jacob Schatz2018-01-221-5/+15
|\ \ \ | | | | | | | | | | | | | | | | Fix callback alignments See merge request gitlab-org/gitlab-ce!16596
| * | | Fix callback alignmentsfix-callback-alignmentsClement Ho2018-01-191-5/+15
| |/ /
* | | Fix eslint UserCalloutfix-eslint-usercalloutClement Ho2018-01-221-1/+0
| | |
* | | Merge branch 'projects-r-s' into 'master'Jacob Schatz2018-01-229-38/+93
|\ \ \ | | | | | | | | | | | | | | | | refactor for projects-r*, s* See merge request gitlab-org/gitlab-ce!16351
| * | | Fix eslintprojects-r-sClement Ho2018-01-191-2/+0
| | | |
| * | | Merge branch 'master' into projects-r-sClement Ho2018-01-1946-204/+420
| |\ \ \ | | |/ /
| * | | Add secretVariable testClement Ho2018-01-191-0/+6
| | | |
| * | | Fix eslintClement Ho2018-01-191-3/+1
| | | |
| * | | Merge branch 'master' into 'projects-r-s'Clement Ho2018-01-1927-102/+192
| |\ \ \ | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/dispatcher.js
| * | | | Fix referenceClement Ho2018-01-181-2/+2
| | | | |
| * | | | Fix eslintClement Ho2018-01-185-16/+4
| | | | |
| * | | | Code improvementsClement Ho2018-01-188-25/+14
| | | | |
| * | | | [skip ci] Improve dispatcherClement Ho2018-01-181-10/+2
| | | | |
| * | | | Add rest of refactor of dispatcher for project:s*Jacob Schatz2018-01-184-23/+51
| | | | |
| * | | | Refactor for projects:sJacob Schatz2018-01-186-4/+53
| | | | |
| * | | | refactor for projects-r*Jacob Schatz2018-01-182-2/+10
| | | | |
* | | | | Merge branch '40029-better-error-handling-on-issuable-templates' into 'master'Clement Ho2018-01-221-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Loading spinner not stop even on errors in the Issuable Templates Closes #40029 See merge request gitlab-org/gitlab-ce!16600
| * | | | | Stop loading spinner on error of issuable templatesTakuya Noguchi2018-01-211-1/+1
| | | | | |
* | | | | | Merge branch 'bvl-parent-preloading' into 'master'Douwe Maan2018-01-222-14/+33
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix filtering projects & groups on group pages Closes #40785 See merge request gitlab-org/gitlab-ce!16584
| * | | | | | Preload ancestors for subgroups matching filterBob Van Landuyt2018-01-221-11/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise we'd only preload the ancestors that would fit the page. That way, when a search result was on the first page, but the ancestor didn't fit the page anymore. We would not have the preloaded ancestor when rendering the hierarchy.
| * | | | | | Don't include projects shared as group-descendantsBob Van Landuyt2018-01-221-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a project is shared with a group, it should not be included as a descendant on the group dashboard.
| * | | | | | Fix filter on `dashboard/groups` & `explore/groupsBob Van Landuyt2018-01-221-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When searching we would limit the scope of ancestors to load because the filter would be applied to the ancestors. Instead, we need to load _all_ ancestors for matching projects.
* | | | | | | Merge branch 'gitaly-write-ref-error-handling' into 'master'Robert Speicher2018-01-221-9/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | Wrap Rugged-exceptions in Gitlab::Git::Repository#write_ref See merge request gitlab-org/gitlab-ce!16570
| * | | | | | Move error-handling to lib/gitlab/gitKim "BKC" Carlbäcker2018-01-221-11/+1
| | | | | | |
| * | | | | | Wrap Rugged-exceptions in Gitlab::Git::Repository#write_refgitaly-write-ref-error-handlingKim "BKC" Carlbäcker2018-01-181-5/+7
| | | | | | |
* | | | | | | Merge branch 'dispatcher-ph-more' into 'master'Filipa Lacerda2018-01-224-16/+34
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added dispatcher imports for sessions route See merge request gitlab-org/gitlab-ce!16608
| * | | | | | | Added dispatcher imports for sessions routedispatcher-ph-morePhil Hughes2018-01-224-16/+34
| | | | | | | |
* | | | | | | | Merge branch '41673-blank-query-members-api' into 'master'Rémy Coutable2018-01-221-0/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Project/#/Members?query= blank causes 500 error" Closes #41673 See merge request gitlab-org/gitlab-ce!16235
| * | | | | | | | Yield no results for blank searches on User name, username and emailMark Fletcher2018-01-211-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Given no search term, the `search` and `search_with_secondary_emails` methods will yield an empty result set
* | | | | | | | | Merge branch 'feat/add-section-headers-to-plus-button-dropdown' into 'master'Annabel Dunstone Gray2018-01-221-0/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add section headers to plus button dropdown #41128 Closes #41128 See merge request gitlab-org/gitlab-ce!16394
| * | | | | | | | | Add section headers to plus button dropdownGeorge Tsiolis2018-01-191-0/+4
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch '41208-commit-atom-feeds-double-escaped' into 'master'Douwe Maan2018-01-221-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Commits atom feed is double-escaped" Closes #41208 See merge request gitlab-org/gitlab-ce!16603
| * | | | | | | | | Allows html in commits atom feedJacopo2018-01-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Html code now works in commits atom feed `title` and `summary`.
* | | | | | | | | | Merge branch 'master' into vue-mr-widget-stateFilipa Lacerda2018-01-2218-17/+28
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Split the setup-test-env job in two Remove the wait time for the login form check Fix protected branches API to accept name parameter with dot Update outdated docs for CI/CD quick start _never_ unset gitlab.full_path Backport to match EE icons Add horizontal scroll to wiki tables Update best_practices.md Remove duplicate list item in "General Guidelines" Section. Permits 'password_authentication_enabled_for_git' parameter for ApplicationSettingsController Move rugged-call from Project#write_repository_config to Git::Repository#write_config doc: Spelling fixes Update Auto DevOps template Disable scss-lint around text-decoration-skip Add text-decoration-skip: ink to all underlined elements Fix Shows signin tab after new user email confirmation Fixes mistake in change log doc.
| * | | | | | | | | Merge branch '42225-mr-icons' into 'master'Phil Hughes2018-01-2211-11/+11
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "MR widget components have different icons in CE and EE" Closes #42225 See merge request gitlab-org/gitlab-ce!16587
| | * | | | | | | | | Backport to match EE icons42225-mr-iconsFilipa Lacerda2018-01-1911-11/+11
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'gitaly-write-repo-config-prep' into 'master'Douwe Maan2018-01-221-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move rugged-call from Project#write_repository_config to Git::Repository#write_config See merge request gitlab-org/gitlab-ce!16572
| | * | | | | | | | | | Move rugged-call from Project#write_repository_config to ↵Kim "BKC" Carlbäcker2018-01-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Git::Repository#write_config
View Lorry Controller Status