Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Extract Variables controllers specs to shared_examples | Matija Čupić | 2018-02-05 | 2 | -191/+12 |
| | |||||
* | Refactor Variable controllers specs | Matija Čupić | 2018-02-05 | 2 | -42/+47 |
| | |||||
* | Extract Variable into separate JSON Schema | Matija Čupić | 2018-02-05 | 2 | -6/+6 |
| | |||||
* | Extract variable parameters in VariablesController specs | Matija Čupić | 2018-02-05 | 2 | -28/+28 |
| | |||||
* | Add GroupVariableSerializer for Ci::GroupVariable | Matija Čupić | 2018-02-05 | 1 | -3/+3 |
| | |||||
* | Add VariableSerializer for Ci::Variable | Matija Čupić | 2018-02-05 | 1 | -3/+3 |
| | |||||
* | Return all variables after UPDATE | Matija Čupić | 2018-02-05 | 2 | -0/+24 |
| | |||||
* | Change POST to PATCH requests in the controller specs | Matija Čupić | 2018-02-05 | 2 | -6/+6 |
| | |||||
* | Fix a typo in Groups::VariablesController spec | Matija Čupić | 2018-02-05 | 1 | -1/+1 |
| | |||||
* | Use `resource` in Group Variables routing scheme | Matija Čupić | 2018-02-05 | 1 | -4/+18 |
| | |||||
* | Use `resource` in Project Variables routing scheme | Matija Čupić | 2018-02-05 | 1 | -4/+23 |
| | |||||
* | Use all parameters in VariablesController specs | Matija Čupić | 2018-02-05 | 2 | -10/+26 |
| | |||||
* | Remove redundant routes in Groups::VariablesController | Matija Čupić | 2018-02-05 | 1 | -41/+0 |
| | |||||
* | Port #save_multiple to Groups::VariablesController | Matija Čupić | 2018-02-05 | 1 | -5/+74 |
| | |||||
* | Remove redundant routes in VariablesController | Matija Čupić | 2018-02-05 | 1 | -47/+0 |
| | |||||
* | Use nested attributes for updating multiple variables | Matija Čupić | 2018-02-05 | 1 | -5/+6 |
| | |||||
* | Add destroy functionality to save_multiple | Matija Čupić | 2018-02-05 | 1 | -0/+20 |
| | |||||
* | Implement multiple variable handling action | Matija Čupić | 2018-02-05 | 1 | -3/+52 |
| | |||||
* | Stub multiple variable controller method | Matija Čupić | 2018-02-05 | 1 | -0/+7 |
| | |||||
* | Change UserCallout feautre_name to enum | Matija Čupić | 2018-02-03 | 1 | -11/+25 |
| | |||||
* | Merge branch 'master' into persistent-callouts | Matija Čupić | 2018-02-02 | 12 | -12/+76 |
|\ | |||||
| * | use Gitlab::UserSettings directly as a singleton instead of ↵ | Mario de la Ossa | 2018-02-02 | 3 | -4/+3 |
| | | | | | | | | including/extending it | ||||
| * | port of 594e6a0a625^..f74c90f68c6 | Micaël Bergeron | 2018-02-01 | 4 | -4/+18 |
| | | |||||
| * | Enable RuboCop Style/RegexpLiteral | Takuya Noguchi | 2018-02-01 | 2 | -4/+4 |
| | | |||||
| * | Merge branch 'zj-gitaly-server-info' into 'master' | Sean McGivern | 2018-01-31 | 1 | -0/+15 |
| |\ | | | | | | | | | | | | | Gitaly Server info for admin panel See merge request gitlab-org/gitlab-ce!16794 | ||||
| | * | Gitaly Server info for admin panel | Zeger-Jan van de Weg | 2018-01-31 | 1 | -0/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements the client side for gitlab-org/gitaly#819. Which is a server info command. This checks the server version and git binairy version on the server. A small UI was added for administrators, so they can check the status of the Gitaly server. This is done for each storage the monolith knows. Because of this commit, gitlab-org/gitlab-ce!15580 is now closed. That MR removed the Git version too, but didn't replace it with anything. | ||||
| * | | Fix not all events being shown in group dashboardsh-fix-events-collection | Stan Hu | 2018-01-30 | 1 | -0/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The group activity feed was limited to the first 20 projects found in the group, which caused activity from some projects to be omitted. A limit of 20 is applied to the query for events, so the extra pagination does little in the way of performance. Closes #42560 | ||||
| * | | Make pagination optional for issuables | Jan Provaznik | 2018-01-30 | 1 | -0/+12 |
| |/ | | | | | | | | | | | | | | | | | | | On epics roadmap page we list all epics in the given time frame without pagination (at least for the first iteration), in this case it would be nice to use the existing issuables index logic except pagination (see MR gitlab-ee!4281). For this reason this patch allows to easily disable pagination. Related gitlab-ee!4281 | ||||
* | | Rename Callout to UserCallout | Matija Čupić | 2018-02-02 | 1 | -3/+3 |
| | | |||||
* | | Refactor CalloutsController | Matija Čupić | 2018-02-02 | 1 | -2/+2 |
| | | |||||
* | | Remove dismissed_state from Callout model | Matija Čupić | 2018-02-02 | 1 | -4/+0 |
| | | |||||
* | | Add CalloutsController specs | Matija Čupić | 2018-01-26 | 1 | -0/+39 |
|/ | |||||
* | Merge branch 'sh-fix-error-500-no-avatars' into 'master' | Robert Speicher | 2018-01-22 | 1 | -1/+7 |
|\ | | | | | | | | | | | | | Fix Error 500 when repository has no avatar Closes #42249 See merge request gitlab-org/gitlab-ce!16601 | ||||
| * | Fix Error 500 when repository has no avatarsh-fix-error-500-no-avatars | Stan Hu | 2018-01-20 | 1 | -1/+7 |
| | | | | | | | | Closes #42249 | ||||
* | | Preload ancestors for subgroups matching filter | Bob Van Landuyt | 2018-01-22 | 1 | -0/+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. | ||||
* | | Fix filter on `dashboard/groups` & `explore/groups | Bob Van Landuyt | 2018-01-22 | 1 | -0/+20 |
| | | | | | | | | | | | | 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 '41208-commit-atom-feeds-double-escaped' into 'master' | Douwe Maan | 2018-01-22 | 1 | -1/+7 |
|\ \ | | | | | | | | | | | | | | | | | | | Resolve "Commits atom feed is double-escaped" Closes #41208 See merge request gitlab-org/gitlab-ce!16603 | ||||
| * | | Allows html in commits atom feed | Jacopo | 2018-01-22 | 1 | -1/+7 |
| | | | | | | | | | | | | Html code now works in commits atom feed `title` and `summary`. | ||||
* | | | Merge branch '42206-permit-password-for-git-param' into 'master' | Rémy Coutable | 2018-01-22 | 1 | -0/+7 |
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | Resolve "Password authentication enabled for Git over HTTP(S) can not be disabled via UI" Closes #42206 See merge request gitlab-org/gitlab-ce!16577 | ||||
| * | | Permits 'password_authentication_enabled_for_git' parameter for ↵ | Mark Fletcher | 2018-01-19 | 1 | -0/+7 |
| |/ | | | | | | | ApplicationSettingsController | ||||
* | | Merge branch '41247-timestamp' into 'master' | Robert Speicher | 2018-01-18 | 1 | -19/+47 |
|\ \ | |/ |/| | | | | | | | | | Use last_edited_at instead of updated_at for displaying issuable last change Closes #41247 See merge request gitlab-org/gitlab-ce!16406 | ||||
| * | Return last edited time instead of update time41247-timestamp | Jan Provaznik | 2018-01-18 | 1 | -19/+47 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | For issuable models we keep two timestamps: updated_at which is updated whenever any model attribute is changed, last_edited_at which is changed when only title or description is changed. In UI bellow description we display who and when updated the item. But last_edited_by (used for 'who') is mistakenly combined with updated_at (when), last_edited_at should be used instead. Closes #41247 | ||||
* | | Merge branch 'feature/merge-request-system-hook' into 'master' | Douwe Maan | 2018-01-18 | 2 | -2/+30 |
|\ \ | |/ |/| | | | | | System hooks for Merge Requests See merge request gitlab-org/gitlab-ce!14387 | ||||
| * | reference triggers.values for permitted parameters | Alexis Reigel | 2018-01-17 | 2 | -3/+30 |
| | | |||||
| * | add missing permitted param | Alexis Reigel | 2018-01-17 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'jej/fix-disabled-oauth-access-10-3' into 'security-10-3' | Robert Speicher | 2018-01-16 | 1 | -0/+75 |
| | | | | | | | | | | | | | | | | | | | | [10.3] Prevent login with disabled OAuth providers See merge request gitlab/gitlabhq!2296 (cherry picked from commit 4936650427ffc88e6ee927aedbb2c724d24b094c) a0f9d222 Prevents login with disabled OAuth providers | ||||
* | | Merge branch 'sh-validate-path-project-import-10-3' into 'security-10-3' | Stan Hu | 2018-01-16 | 1 | -0/+38 |
| | | | | | | | | | | | | | | | | | | | | Validate project path in Gitlab import - 10.3 port See merge request gitlab/gitlabhq!2268 (cherry picked from commit 94c82376d66fc80d46dd2d5eeb5bade408ec6a7e) 2b94a7c2 Validate project path in Gitlab import | ||||
* | | Fix error on changes tab when merge request cannot be createdissue_41460 | Felipe Artur | 2018-01-15 | 1 | -17/+25 |
| | | |||||
* | | Refactor GCP redirect test suite | Matija Čupić | 2018-01-11 | 1 | -5/+4 |
| | | |||||
* | | Fix GCP Controller spec | Matija Čupić | 2018-01-11 | 1 | -1/+5 |
| | |