summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* enable eslint to resolve webpack modules according to webpack.config.jseslint-resolve-webpack-modulesMike Greiling2017-02-142-4/+11
* Merge branch 'quick-submit-fixture' into 'master' dz-rename-path-with-namespaceAlfredo Sumaran2017-02-133-24/+32
|\
| * Replace static fixture for behaviors/quick_submit_spec.js (!9086)winniehell2017-02-113-10/+17
| * Use textarea for quick submit specwinniehell2017-02-112-14/+15
* | Merge branch 'merge-request-tabs-fixture' into 'master' Alfredo Sumaran2017-02-134-24/+42
|\ \
| * | Replace static fixture for merge_request_tabs_spec.js (!9172)winniehell2017-02-134-24/+42
| |/
* | Merge branch '27480_deploy_keys_should_not_show_up_in_users_keys_list' into '...Douwe Maan2017-02-135-13/+53
|\ \
| * | Make deploy key not show in User's keys listPawel Chojnacki2017-02-135-13/+53
* | | Merge branch '22818-licence-gitignore-and-yml-endpoints-removal' into 'master' Rémy Coutable2017-02-138-97/+398
|\ \ \
| * | | Remove deprecated templates endpoints in V422818-licence-gitignore-and-yml-endpoints-removalOswaldo Ferreira2017-02-138-97/+398
* | | | Merge branch 'option-to-be-notified-of-own-activity' into 'master' Douwe Maan2017-02-1310-6/+168
|\ \ \ \
| * | | | Remove `try` from NotificationService#build_recipientsRichard Macklin2017-02-031-1/+1
| * | | | Refactor NotificationService#pipeline_finished to use skip_current_userRichard Macklin2017-02-031-2/+3
| * | | | Use `let` in Profiles::NotificationsController specRichard Macklin2017-02-031-12/+9
| * | | | Use check and uncheck methods from Capybara DSLRichard Macklin2017-02-011-2/+2
| * | | | Add missing newline in Profiles::NotificationsController specRichard Macklin2017-02-011-0/+1
| * | | | Add changelog entry for option to be notified of your own activityRichard Macklin2017-02-011-0/+4
| * | | | Add checkbox in UI to opt into receiving notifications about your activityRichard Macklin2017-02-013-0/+38
| * | | | Update NotificationService to respect User#notified_of_own_activityRichard Macklin2017-02-012-3/+62
| * | | | Add notified_of_own_activity to permitted attributesRichard Macklin2017-02-012-2/+3
| * | | | Add notified_of_own_activity column to users tableRichard Macklin2017-02-012-0/+15
| * | | | Add controller spec for Profiles::NotificationsControllerRichard Macklin2017-02-011-0/+46
* | | | | Merge branch '24333-close-issues-with-merge-request-title-ui' into 'master' Rémy Coutable2017-02-133-5/+36
|\ \ \ \ \
| * | | | | Show mentioned/issues being closed from a Merge Requests titleJan Christophersen2017-02-133-5/+36
| | |_|/ / | |/| | |
* | | | | Merge branch '27395-reduce-group-activity-sql-queries' into 'master' Yorick Peterse2017-02-134-14/+21
|\ \ \ \ \
| * | | | | Use preload for Event#target since it's a polymorphic association27395-reduce-group-activity-sql-queriesRémy Coutable2017-02-132-13/+12
| * | | | | Include :author, :project, and :target in Event.with_associationsRémy Coutable2017-02-132-1/+5
| * | | | | Don't instantiate AR objects in Event.in_projectsRémy Coutable2017-02-132-1/+5
* | | | | | Merge branch 'rs-rubocop-rspec' into 'master' Rémy Coutable2017-02-136-74/+67
|\ \ \ \ \ \
| * | | | | | Enable `Lint/EmptyWhen` cop and correct offenseRobert Speicher2017-02-133-5/+5
| * | | | | | Enable `Style/RedundantException` cop and correct offenseRobert Speicher2017-02-103-6/+5
| * | | | | | Enable the `RSpec/ExpectActual` cop and correct offensesRobert Speicher2017-02-104-59/+53
| * | | | | | Explicitly disable the RSpec/BeEql copRobert Speicher2017-02-102-4/+4
* | | | | | | Merge branch 'dm-quick-fix-web-edit-new-lines' into 'master' Robert Speicher2017-02-132-0/+19
|\ \ \ \ \ \ \
| * | | | | | | Respect autocrlf setting when creating/updating file through web UIdm-quick-fix-web-edit-new-linesDouwe Maan2017-02-132-0/+19
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'sh-add-labels-index' into 'master' Yorick Peterse2017-02-133-0/+18
|\ \ \ \ \ \ \
| * | | | | | | Add indices to improve loading of labels pagesh-add-labels-indexStan Hu2017-02-133-0/+18
* | | | | | | | Merge branch 'silence-webpack' into 'master' Filipa Lacerda2017-02-131-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | only print errors and warnings from webpack dev serversilence-webpackSimon Knox2017-02-111-1/+2
* | | | | | | | | Merge branch '27939-fix-current-build-arrow' into 'master' Filipa Lacerda2017-02-133-1/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix current build arrow27939-fix-current-build-arrowEric Eastwood2017-02-133-1/+9
* | | | | | | | | | Merge branch '23535-folders-in-wiki-repository' into 'master' Douwe Maan2017-02-1318-14/+306
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix haml-lint violationAlex Braha Stoll2017-02-131-1/+1
| * | | | | | | | | Add merge request numberAlex Braha Stoll2017-01-301-1/+1
| * | | | | | | | | Add WikiPage.unhyphenizeAlex Braha Stoll2017-01-303-2/+14
| * | | | | | | | | Merge branch 'master' into 23535-folders-in-wiki-repositoryAlex Braha Stoll2017-01-291671-10299/+39818
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove directories as one of the attributes of WikiDirectoryAlex Braha Stoll2016-12-312-15/+5
| * | | | | | | | | | Add new wiki related partialsAlex Braha Stoll2016-12-313-10/+9
| * | | | | | | | | | Improve WikiPage.group_by_directoryAlex Braha Stoll2016-12-311-1/+1
| * | | | | | | | | | Change WikiPage#directoryAlex Braha Stoll2016-12-312-8/+7
View Lorry Controller Status