summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-10-04466-2648/+8923
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (372 commits) Enable Lint/StringConversionInInterpolation cop and autocorrect offenses resolve duplicated changelog entry credit myself :smile: change determine conditions override subject method in devise mailer follow the styleguide: Don't use parentheses around a literal wrap subject with method subject move spec back into shared example `an email sent from GitLab` stub config settings in spec remove empty line at block body end remove extra entry create new test in `spec/mailers/notify_spec.rb` move changelog to 8.13 add configurable email subject suffix Fixes sidebar navigation. Convert "SSH Keys" Spinach features to RSpec Enable import/export back for non-admins Update gitlab-shell to 3.6.3 Updated artwork of empty group state. Better empty state for Groups view. ...
| * Merge branch 'rs-string-conversion-in-interpolation' into 'master' Rémy Coutable2016-10-0311-14/+13
| |\ | | | | | | | | | | | | | | | | | | Enable Lint/StringConversionInInterpolation cop and autocorrect offenses See merge request !6654
| | * Enable Lint/StringConversionInInterpolation cop and autocorrect offensesrs-string-conversion-in-interpolationRobert Speicher2016-10-0311-14/+13
| | |
| * | Merge branch 'master' into 'master' Rémy Coutable2016-10-0310-24/+25
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Changed Slack service user referencing from full name to username Closes #22737 See merge request !6624
| | * \ Merge branch 'master' of https://gitlab.com/secustor/gitlab-ce.gitsecustor2016-10-030-0/+0
| | |\ \
| | | * \ Merge branch 'master' of https://gitlab.com/secustor/gitlab-ce.gitsebastian.poxhofer2016-10-020-0/+0
| | | |\ \
| | | | * | adapted tests for usage of the usernamesecustor2016-10-015-20/+20
| | | | | |
| | | | * | Changed Slack service user referencing from full name to usernamesecustor2016-09-305-4/+5
| | | | | |
| | | * | | adapted tests for usage of the usernamesecustor2016-10-025-20/+20
| | | | | |
| | | * | | Changed Slack service user referencing from full name to usernamesecustor2016-10-025-4/+5
| | | | | |
| | * | | | Changed Slack service user referencing from full name to usernamesecustor2016-10-0310-24/+25
| | | | | |
| * | | | | Merge branch 'add-email-subject-suffix' into 'master' Rémy Coutable2016-10-039-11/+36
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add configurable email subject suffix ## Why was this MR needed? I noticed that there is a commit 44ab156e 3 years ago which removes email subject prefix actually we do need an special part of the email subject which makes the email subject easy to identify we just need to make it configurable rather than remove it. See merge request !6172
| | * | | | | resolve duplicated changelog entryFu Xu2016-10-031-1/+0
| | | | | | |
| | * | | | | credit myself :smile:Fu Xu2016-10-031-0/+1
| | | | | | |
| | * | | | | change determine conditionsFu Xu2016-10-032-2/+2
| | | | | | |
| | * | | | | override subject method in devise mailerFu Xu2016-10-032-1/+10
| | | | | | |
| | * | | | | follow the styleguide: Don't use parentheses around a literalFu Xu2016-10-031-1/+1
| | | | | | |
| | * | | | | wrap subject with method subjectFu Xu2016-10-031-1/+1
| | | | | | |
| | * | | | | move spec back into shared example `an email sent from GitLab`Fu Xu2016-10-032-7/+10
| | | | | | |
| | * | | | | stub config settings in specFu Xu2016-10-031-5/+2
| | | | | | |
| | * | | | | remove empty line at block body endFu Xu2016-10-031-1/+0
| | | | | | |
| | * | | | | remove extra entryFu Xu2016-10-031-3/+0
| | | | | | |
| | * | | | | create new test in `spec/mailers/notify_spec.rb`Fu Xu2016-10-032-4/+11
| | | | | | |
| | * | | | | move changelog to 8.13Fu Xu2016-10-031-1/+1
| | | | | | |
| | * | | | | add configurable email subject suffixFu Xu2016-10-036-9/+22
| | | | | | |
| * | | | | | Merge branch 'aiionx_sidekiq_log_patch' into 'master' Rémy Coutable2016-10-031-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Log sidekiq arguments as json Logging the sidekiq job arguments as a ruby literal structure is akward. Specially when parsing the logs. JSON is a standar format. See merge request !3735
| | * | | | | | aiionx_sidekiq_log_patchDavid2016-04-151-1/+1
| | | | | | | |
| * | | | | | | Merge branch '22466-task-list-fork' into 'master' Rémy Coutable2016-10-034-52/+16
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Task List Checkbox Alignment" ## What does this MR do? Replace the unmaintained `task_list` gem with the `deckar01-task_list` fork ## Are there points in the code the reviewer needs to double check? - I had to pin some dependencies in the fork to support `ruby < 2.2`, which added new version restrictions for 2 existing modules. - I triggered a build after I removed the patch to show the test passed with the new gem, then I removed the test, because this behavior is tested in the gem's repo now. ## Why was this MR needed? - The `task_list` patch was added with a comment that said it should be removed when merged upstream, but the repo got archived, so an upstream patch requires a fork. - #22470 can't be patched without warnings due to the way `task_list` uses Ruby constants. - There are additional outstanding `task_list` bugs that can be fixed once we switch to a fork. ## What are the relevant issue numbers? - #22466 - #22470 - !6487 See merge request !6625
| | * | | | | | Remove the task_list test since it is patched upstreamJared Deckard2016-09-301-16/+0
| | | | | | | |
| | * | | | | | Align gem version stringsJared Deckard2016-09-301-10/+10
| | | | | | | |
| | * | | | | | Replace talk_list patch with a patched forkJared Deckard2016-09-303-26/+6
| | | | | | | |
| * | | | | | | Merge branch 'zj-grape-award-emoji' into 'master' Robert Speicher2016-10-031-33/+31
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GrapeDSL for Award Emoji endpoints Cherry-picked from !6330 See merge request !6629
| | * | | | | | | GrapeDSL for Award Emoji endpointszj-grape-award-emojiZ.J. van de Weg2016-10-031-33/+31
| | | | | | | | |
| * | | | | | | | Merge branch 'fix/import-export-admin' into 'master' Robert Speicher2016-10-036-9/+7
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Import/Export for non-admin users Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21315 Related https://gitlab.com/gitlab-org/gitlab-ce/issues/20857 and https://gitlab.com/gitlab-org/gitlab-ce/issues/20821/ See merge request !6080
| | * | | | | | | | Enable import/export back for non-adminsfix/import-export-adminJames Lopez2016-10-036-9/+7
| | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'use-custom-ruby-images' into 'master' Rémy Coutable2016-10-033-19/+3
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use custom Ruby images to test builds It allows us to remove redundant steps of installing required dependencies for every build. See merge request !4506
| | * | | | | | | | Move the images over to dev.gitlab.orguse-custom-ruby-imagesZ.J. van de Weg2016-09-302-3/+3
| | | | | | | | | |
| | * | | | | | | | Update CI yaml and update CHANGELOG entryZ.J. van de Weg2016-09-302-3/+3
| | | | | | | | | |
| | * | | | | | | | Set CHANGELOG item to right releaseZ.J. van de Weg2016-09-301-1/+1
| | | | | | | | | |
| | * | | | | | | | remove unused cache from .gitlab-ci.ymlZ.J. van de Weg2016-09-301-2/+0
| | | | | | | | | |
| | * | | | | | | | Use custom Ruby images to test buildsKamil Trzcinski2016-09-303-17/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It allows us to remove redundant steps of installing required dependencies for every build.
| * | | | | | | | | Merge branch 'group-empty-state' into 'master' Jacob Schatz2016-10-035-6/+52
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Better empty state for Groups view. Implemented @hazelyang's [awesome design](https://gitlab.com/gitlab-org/gitlab-ce/uploads/9141470ed121f137a4074ae4e12c449c/groups-empty.png) for empty group views. Fixes #20829 ### Design ![https://gitlab.com/gitlab-org/gitlab-ce/uploads/9141470ed121f137a4074ae4e12c449c/groups-empty.png](https://gitlab.com/gitlab-org/gitlab-ce/uploads/9141470ed121f137a4074ae4e12c449c/groups-empty.png) ### Screenshots ![Screen_Shot_2016-09-28_at_13.43.35](/uploads/e2ab668a412596205deb67c97af78a1d/Screen_Shot_2016-09-28_at_13.43.35.png) ![Screen_Shot_2016-09-28_at_13.44.54](/uploads/c4301166f353f0ee198aecdc46cdfe66/Screen_Shot_2016-09-28_at_13.44.54.png) ![Screen_Shot_2016-09-28_at_13.46.10](/uploads/92024e866871969ec7a28db4b8e87220/Screen_Shot_2016-09-28_at_13.46.10.png) ![Screen_Shot_2016-09-28_at_13.46.20](/uploads/f1b515c7aa09d06e80a419d98ff76fd6/Screen_Shot_2016-09-28_at_13.46.20.png) ![Screen_Shot_2016-09-28_at_13.46.34](/uploads/76cdd5f0e9d3c59d017df26172f7dd4d/Screen_Shot_2016-09-28_at_13.46.34.png) See merge request !6566
| | * | | | | | | | | Updated artwork of empty group state.group-empty-stateFatih Acet2016-10-031-1/+1
| | | | | | | | | | |
| | * | | | | | | | | Better empty state for Groups view.Fatih Acet2016-10-035-6/+52
| | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'rs-convert-ssh-key-features' into 'master' Robert Speicher2016-10-033-70/+43
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert "SSH Keys" Spinach features to RSpec See merge request !6639
| | * | | | | | | | | Convert "SSH Keys" Spinach features to RSpecrs-convert-ssh-key-featuresRobert Speicher2016-10-033-70/+43
| | |/ / / / / / / /
| * | | | | | | | | Merge branch 'zj-grape-keys' into 'master' Rémy Coutable2016-10-031-4/+3
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GrapeDSL for Keys endpoint No changelog item as it doesn't change behaviour Cherry-picket from !6330 See merge request !6631
| | * | | | | | | | | GrapeDSL for Keys endpointzj-grape-keysZ.J. van de Weg2016-10-011-4/+3
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'update-gitlab-shell-3-6-3' into 'master' Rémy Coutable2016-10-032-2/+2
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update GITLAB_SHELL_VERSION to 3.6.3 Because VERSION at the gitlab-shell v3.6.2 tag was still 3.6.1: https://gitlab.com/gitlab-org/gitlab-shell/blob/v3.6.2/VERSION (my bad!) VERSION at the v3.6.3 tag is now 3.6.3: https://gitlab.com/gitlab-org/gitlab-shell/blob/v3.6.3/VERSION See merge request !6621
| | * | | | | | | | | | Update gitlab-shell to 3.6.3Rémy Coutable2016-10-032-2/+2
| | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
View Lorry Controller Status