summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'gt-externalize-app-views-projects-milestones' into 'master'ee-1979-2-controllerKushal Pandya2019-01-297-37/+75
|\ | | | | | | | | Externalize strings from `/app/views/projects/milestones` See merge request gitlab-org/gitlab-ce!24726
| * Externalize strings from `/app/views/projects/milestones`George Tsiolis2019-01-297-37/+75
|/
* Merge branch 'renovate/gitlab-svgs-1.x' into 'master'Kushal Pandya2019-01-292-5/+5
|\ | | | | | | | | Update dependency @gitlab/svgs to ^1.48.0 See merge request gitlab-org/gitlab-ce!24744
| * Update dependency @gitlab/svgs to ^1.48.0Lukas 'Eipi' Eipert2019-01-292-5/+5
| |
* | Merge branch '50352-sort-save' into 'master'Sean McGivern2019-01-2917-45/+151
|\ \ | | | | | | | | | | | | | | | | | | Save sorting preference for Issues/MRs in BE Closes #50352 See merge request gitlab-org/gitlab-ce!24198
| * | Save sorting preference for Issues/MRs in BEMario de la Ossa2019-01-2817-45/+151
| | | | | | | | | | | | | | | | | | In order to let users' sorting preferences transfer between devices, we save the preference for issues and MRs (one preference for issues, one for MRs) in the backend inside the UserPreference object
* | | Merge branch 'gt-externalize-app-views-clusters' into 'master'Filipa Lacerda2019-01-296-11/+22
|\ \ \ | | | | | | | | | | | | | | | | Externalize strings from `/app/views/clusters` See merge request gitlab-org/gitlab-ce!24666
| * | | Externalize strings from `/app/views/clusters`George Tsiolis2019-01-296-11/+22
| | |/ | |/|
* | | Merge branch 'docs-localized-dates-in-ruby' into 'master'Marcia Ramos2019-01-291-0/+10
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Document how to format localized dates in Ruby Closes #41237 See merge request gitlab-org/gitlab-ce!24585
| * | Document how to format localized dates in RubyMayra Cabrera2019-01-281-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | This documents the two ways we currently localized dates: 1) Using l helper 2) Through strftime Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/41237
* | | Merge branch 'gitlab-kitchen-analogy-docs' into 'master'Mike Lewis2019-01-291-0/+5
|\ \ \ | | | | | | | | | | | | | | | | Add GitLab as kitchen analogy See merge request gitlab-org/gitlab-ce!24742
| * | | Update kitchen metaphor per Suri commentMike Lewis2019-01-291-3/+4
| | | |
| * | | Small edit to kitchen analogyMike Lewis2019-01-281-1/+1
| | | |
| * | | Update kitchen analogy textMike Lewis2019-01-281-3/+3
| | | |
| * | | Add GitLab as kitchen analogyMike Lewis2019-01-281-0/+4
| |/ /
* | | Merge branch 'docs-56814-ci-variable-url-clarify' into 'master'Evan Read2019-01-291-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Clarify that project URL could be HTTP or HTTPS Closes #56814 See merge request gitlab-org/gitlab-ce!24667
| * | | Clarify that project URL could be HTTP or HTTPSMark Fletcher2019-01-251-1/+1
| | | |
* | | | Merge branch 'qa-ml-fix-rebase-spec' into 'master'Ramya Authappan2019-01-282-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reload if needed when checking merge status Closes gitlab-org/quality/nightly#64 See merge request gitlab-org/gitlab-ce!24732
| * | | | Reload if needed when checking merge statusMark Lapierre2019-01-282-3/+3
| | | | |
* | | | | Merge branch 'refactor/56366-extract-resolve-discussion-button' into 'master'Fatih Acet2019-01-284-10/+115
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | refactor(NoteableDiscussion): Extracted ResolveDiscussionButton from See merge request gitlab-org/gitlab-ce!24505
| * | | | | refactor(NoteableDiscussion): Extracted ResolveDiscussionButton fromMartin Hobert2019-01-284-10/+115
|/ / / / /
* | | | | Merge branch ↵Robert Speicher2019-01-284-1/+63
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '36445-better-indication-that-an-issue-has-been-moved-or-marked-as-duplicated' into 'master' Indicate on Issue Status if an Issue was Moved Closes #36445 See merge request gitlab-org/gitlab-ce!24470
| * | | | Indicate on Status if Issue was Moved36445-better-indication-that-an-issue-has-been-moved-or-marked-as-duplicatedAndrew Fontaine2019-01-254-1/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the text `(moved)` to the `Closed` status indicator on a closed issue if the reason the issue was closed was due to moving it. This only applies to closed issues. Issues that were closed and moved then later re-opened only show `Open`. This makes it more immidately clear why the issue was closed.
* | | | | Merge branch 'renovate/gitlab-ui-1.x' into 'master'Clement Ho2019-01-282-5/+5
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Update dependency @gitlab/ui to ^1.22.1 See merge request gitlab-org/gitlab-ce!24734
| * | | | Update dependency @gitlab/ui to ^1.22.1Lukas 'Eipi' Eipert2019-01-282-5/+5
| | | | |
* | | | | Merge branch 'refactor/56369-extract-jump-to-next-discussion-button' into ↵Phil Hughes2019-01-285-10/+75
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Refactor/56369 extract jump to next discussion button Closes #56369 See merge request gitlab-org/gitlab-ce!24506
| * | | | refactor(NoteableDiscussion): Extracted JumpToNextDiscussionButton to its ↵Martin Hobert2019-01-285-10/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | own component fix #56369 chore(changelog): Added changelog entry chore(prettier): Formated with prettier test(JumpToNextDiscussionButton): Added test for new component test(Refactored tests to use vue test-utils): chore(translations): Added newly generated locales Update spec/javascripts/notes/components/discussion_jump_to_next_button_spec.js chore(prettier): Formated with prettier test(JumpToNextDiscussionButton): Updated tests to use a local vue instance test(JumpToNextDiscussionButton): Running tests in async to prevent maximum stack overflow
* | | | | Merge branch 'bw-enable-sourcepos' into 'master'Robert Speicher2019-01-2821-17/+113
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Enable CommonMark source line position information See merge request gitlab-org/gitlab-ce!23971
| * | | | | Fix review commentsBrett Walker2019-01-2116-32/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | including refactoring, disabling sourcepos for pipelines that don't need it, and minimizing spec changes by disabling sourcepos when not testing for it explicitly.
| * | | | | Enable CommonMark source line position informationBrett Walker2019-01-2117-22/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds 'data-sourcepos' to tags, indicating which line of markdown it came from. Sets the stage for intelligently manipulating specific lines of markdown.
* | | | | | Merge branch 'gt-externalize-app-views-projects-pages_domains' into 'master'Clement Ho2019-01-286-27/+84
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Externalize strings from `/app/views/projects/pages_domains` See merge request gitlab-org/gitlab-ce!24723
| * | | | | | Externalize strings from `/app/views/projects/pages_domains`George Tsiolis2019-01-286-27/+84
| | | | | | |
* | | | | | | Merge branch 'qa-stabalize-go_to_profile_settings' into 'master'Mark Lapierre2019-01-281-2/+6
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use retry to improve reliability of go_to_profile_settings Closes gitlab-org/quality/nightly#65 See merge request gitlab-org/gitlab-ce!24719
| * | | | | | Use retry to stablize go_to_profile_settingsSanad Liaquat2019-01-281-2/+6
| | | | | | |
* | | | | | | Merge branch 'fix-select2-helper' into 'master'Sean McGivern2019-01-281-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix running a single spec file with rspec See merge request gitlab-org/gitlab-ce!24729
| * | | | | | | Fix running a single spec file with rspecNick Thomas2019-01-281-0/+2
|/ / / / / / /
* | | | | | | Merge branch '44698-recaptcha' into 'master'Kushal Pandya2019-01-283-2/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent unload when Recaptcha is open Closes #44698 See merge request gitlab-org/gitlab-ce!24625
| * | | | | | | Prevent unload when Recaptcha is openRajat Jain2019-01-283-2/+11
| | | | | | | |
* | | | | | | | Merge branch 'renovate/gitlab-ui-1.x' into 'master'Kushal Pandya2019-01-282-5/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update dependency @gitlab/ui to ^1.22.0 See merge request gitlab-org/gitlab-ce!24721
| * | | | | | | | Update dependency @gitlab/ui to ^1.22.0Lukas 'Eipi' Eipert2019-01-282-5/+5
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch '56867-wait-for-requests-before-select2' into 'master'Sean McGivern2019-01-282-3/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wait for requests in specs before interacting with select2 Closes #56867 See merge request gitlab-org/gitlab-ce!24694
| * | | | | | | | Wait for requests in specs before interacting with select2Nick Thomas2019-01-282-3/+4
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'sh-bump-sidekiq-5.2.5' into 'master'Rémy Coutable2019-01-281-2/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump Sidekiq to 5.2.5 See merge request gitlab-org/gitlab-ce!24662
| * | | | | | | | Bump Sidekiq to 5.2.5Stan Hu2019-01-251-2/+3
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reduces duplication caused by gitlab-monitor already shipping Sidekiq 5.2.5. The only changes appear to be minor: https://github.com/mperham/sidekiq/blob/master/Changes.md
* | | | | | | | Merge branch 'fix-explore-page-star-button' into 'master'Phil Hughes2019-01-282-4/+8
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Fix `star` action in the `explore` subpages See merge request gitlab-org/gitlab-ce!24693
| * | | | | | | Fix `star` action in the `explore` subpagesRiccardo Padovani2019-01-282-4/+8
|/ / / / / / /
* | | | | | | Merge branch 'ce-1979-2-1' into 'master'Sean McGivern2019-01-284-2/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add query method for id See merge request gitlab-org/gitlab-ce!24386
| * | | | | | | Add query method for id queryMark Chao2019-01-154-2/+19
| | | | | | | |
* | | | | | | | Merge branch '54213-standardize-token-value-capitalization-in-filter-bar' ↵Kushal Pandya2019-01-2812-45/+52
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Standardize token value capitalization in filter bar Closes #54213 See merge request gitlab-org/gitlab-ce!23846
| * | | | | | | Standardize token value capitalization in filter barOmar Bahareth2019-01-2812-45/+52
|/ / / / / / /
View Lorry Controller Status