summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Apply reviewer suggestionsweimeng-email-routingWei-Meng Lee2019-05-311-1/+1
|
* Move method into groupWei-Meng Lee2019-05-312-1/+5
|
* Simplify logic using new group notification settings methodWei-Meng Lee2019-05-311-17/+5
|
* Guarantee order of notification settingsWei-Meng Lee2019-05-313-14/+12
|
* Move group_notification_email outside conditionalWei-Meng Lee2019-05-311-2/+1
|
* Fix typo in project invitation declined testWei-Meng Lee2019-05-311-1/+1
|
* Send notifications to group-specific email addressWei-Meng Lee2019-05-3115-38/+117
| | | | | | - Select notification email by walking up group/subgroup path - Add settings UI to set group email notification address - Add tests
* Merge branch '59587-add-graphql-logging' into 'master'Sean McGivern2019-05-311-1/+1
|\ | | | | | | | | | | | | Add logging to GraphQL Closes #59587 See merge request gitlab-org/gitlab-ce!27885
| * Implement logger analyzercharlieablett2019-05-301-1/+1
| | | | | | | | | | | | | | - Modify GraphqlLogger to subclass JsonLogger - Replace the single-line analyser with one that can log all the GraphQL query related information in one place. - Implement analyzer behavior with spec
* | Merge branch 'remove-legacy-artifacts-related-code' into 'master'Kamil Trzciński2019-05-313-120/+29
|\ \ | | | | | | | | | | | | | | | | | | Remove legacy artifact related code Closes #58595 See merge request gitlab-org/gitlab-ce!26475
| * | Remove legacy artifact related coderemove-legacy-artifacts-related-codeShinya Maeda2019-05-313-120/+29
| | | | | | | | | | | | | | | | | | We've already migrated all the legacy artifacts to the new realm, which is ci_job_artifacts table. It's time to remove the old code base that is no longer used.
* | | Update participants paddingJacques Erasmus2019-05-311-4/+2
| | | | | | | | | | | | Updated the padding to our standard size
* | | Change query to work on mysql as well. Also set entire date because setting ↵Luke Picciau2019-05-311-0/+11
| | | | | | | | | | | | only the year can trip 'start_date_should_be_less_than_due_date'
* | | Remove nils from project_statistics.packages_sizeAlessio Caiazza2019-05-311-1/+1
| | | | | | | | | | | | Now it defaults to 0
* | | Merge branch 'bvl-phabricator-import-issues' into 'master'Phil Hughes2019-05-318-28/+99
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Setup Phabricator import Closes #60562 See merge request gitlab-org/gitlab-ce!27877
| * | | Setup Phabricator importBob Van Landuyt2019-05-318-28/+99
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This sets up all the basics for importing Phabricator tasks into GitLab issues. To import all tasks from a Phabricator instance into GitLab, we'll import all of them into a new project that will have its repository disabled. The import is hooked into a regular ProjectImport setup, but similar to the GitHub parallel importer takes care of all the imports itself. In this iteration, we're importing each page of tasks in a separate sidekiq job. The first thing we do when requesting a new page of tasks is schedule the next page to be imported. But to avoid deadlocks, we only allow a single job per worker type to run at the same time. For now we're only importing basic Issue information, this should be extended to richer information.
* | | Merge branch '62148-groupDeleteConfirm' into 'master'Bob Van Landuyt2019-05-311-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | delete group confirm popup mention projects deletion Closes #62148 See merge request gitlab-org/gitlab-ce!28899
| * | | Apply suggestion to app/helpers/groups_helper.rbManeschi Romain2019-05-301-1/+1
| | | |
| * | | delete group confirm popup mention projects deletionRomain Maneschi2019-05-291-1/+1
| | | |
* | | | Merge branch 'i18n-Two_Factor_Authentication-of-user-profile' into 'master'Bob Van Landuyt2019-05-316-46/+42
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Externalize strings of Two-Factor Authentication page in user profile See merge request gitlab-org/gitlab-ce!28749
| * | | | Fix bug for picking up string that end with html_safeantonyliu2019-05-311-3/+3
| | | | | | | | | | | | | | | Move .html_safe outside of the _() so the parser picks up on the translation.
| * | | | Apply suggestion to app/views/profiles/two_factor_auths/_codes.html.hamlantony liu2019-05-311-1/+2
| | | | |
| * | | | Apply suggestion to app/views/profiles/two_factor_auths/show.html.hamlantony liu2019-05-311-1/+1
| | | | |
| * | | | Externalize strings of Two-Factor Authentication page in user profileantonyliu2019-05-316-46/+41
| | |/ / | |/| |
* | | | Merge branch 'i18n-password-of-user-profile' into 'master'Bob Van Landuyt2019-05-313-20/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Externalize strings of password page in user profile See merge request gitlab-org/gitlab-ce!28744
| * | | | Make CE and EE consistentantonyliu2019-05-301-1/+1
| | | | |
| * | | | Fix method typing errorantonyliu2019-05-291-1/+1
| | | | |
| * | | | Merge remote-tracking branch 'origin/i18n-password-of-user-profile' into ↵antonyliu2019-05-291-3/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | i18n-password-of-user-profile
| | * | | | Apply suggestion to app/views/profiles/passwords/edit.html.hamlantonyliu2019-05-291-3/+4
| | | | | | | | | | | | | | | | | | Apply @reprazent suggestion. See gitlab-org/gitlab-ee!13339
| | * | | | Merge branch masterantonyliu2019-05-2991-546/+1030
| | |\ \ \ \
| | * | | | | Externalize strings of password page in user profileantonyliu2019-05-253-19/+19
| | | | | | |
| * | | | | | Apply suggestion to app/views/profiles/passwords/edit.html.hamlantonyliu2019-05-291-3/+4
| | | | | | | | | | | | | | | | | | | | | Apply @reprazent suggestion. See gitlab-org/gitlab-ee!13339
| * | | | | | Externalize strings of password page in user profileantonyliu2019-05-292-16/+16
| | | | | | |
* | | | | | | Merge branch 'gt-open-visibility-help-link-in-a-new-tab' into 'master'Phil Hughes2019-05-311-1/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Open snippets visibility help link in a new tab Closes #61911 See merge request gitlab-org/gitlab-ce!28603
| * | | | | | Open snippets visibility help link in a new tabGeorge Tsiolis2019-05-301-1/+1
| | | | | | |
* | | | | | | Sort by position in issue boards store addList()Winnie Hellmann2019-05-303-17/+16
| | | | | | |
* | | | | | | Merge branch 'upgrade-core-js' into 'master'Mike Greiling2019-05-302-18/+19
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | Upgrade core-js to v3.1.3 and enable URL polyfill See merge request gitlab-org/gitlab-ce!28909
| * | | | | | Upgrade core-js and add URL polyfillupgrade-core-jsPaul Gascou-Vaillancourt2019-05-302-18/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Upgraded core-js from v2.x to v3.1.3 - Updated core-js import statements - Enabled URL polyfill
* | | | | | | Merge branch '609120-ref-link' into 'master'Mayra Cabrera2019-05-301-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes ref being displayed as raw HTML Closes #60912 See merge request gitlab-org/gitlab-ce!28823
| * | | | | | | Fixes ref being displayed as raw HTML609120-ref-linkFilipa Lacerda2019-05-301-1/+1
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | The ref to the branch was being displayed as raw HTML in the Pipelines page
* | | | | | | Externalize strings of PGP Keys and SSH Keys page in user profileantony liu2019-05-3010-36/+38
| | | | | | |
* | | | | | | Add offset adjust to fix line positionJustin Boyson2019-05-301-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added offset adjustment for diff file header and version menus container divs. This should make the linked line be visible.
* | | | | | | Merge branch '62485-label-weights' into 'master'Annabel Dunstone Gray2019-05-301-0/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Give all labels bold weight Closes #62485 See merge request gitlab-org/gitlab-ce!28895
| * | | | | | | Give all labels bold weight62485-label-weightsJarek Ostrowski2019-05-291-0/+6
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Form check labels get normal weight Add changelog
* | | | | | | Merge branch 'fix-label-color-titles' into 'master'Sean McGivern2019-05-301-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix inconsistent capitalization in label colors See merge request gitlab-org/gitlab-ce!28922
| * | | | | | | Fix inconsistent capitalization in label colorsHeinrich Lee Yu2019-05-301-2/+2
| | | | | | | |
* | | | | | | | Get copy to clipboard button aligned within snippet headerMarcel van Remmerden2019-05-306-7/+9
|/ / / / / / /
* | | | | | | Merge branch '9121-sort-relative-position' into 'master'docs/create-table-driven-standardsSean McGivern2019-05-304-33/+51
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support sorting issues using `relative_position` Closes #62178 See merge request gitlab-org/gitlab-ce!28566
| * | | | | | | Check for manual_sorting feature flag9121-sort-relative-positionBrett Walker2019-05-281-1/+1
| | | | | | | |
| * | | | | | | Allow issues to be sorted by relative_positionBrett Walker2019-05-284-33/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - adding a "Manual" option to the dropdown - show 100 issues list when manually sorting
View Lorry Controller Status