Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Uploads to wiki stored inside the wiki git repository | Francisco Javier López | 2018-09-04 | 10 | -36/+635 |
* | Merge branch '_acet-disable-ide-button' into 'master' | Tim Zallmann | 2018-09-04 | 1 | -16/+29 |
|\ | |||||
| * | Disable Web IDE button if user is not allowed to push the source branch. | Fatih Acet | 2018-09-03 | 1 | -16/+29 |
* | | Merge branch '50101-add-artifact-information-to-job-api' into 'master' | Kamil Trzciński | 2018-09-04 | 7 | -8/+110 |
|\ \ | |||||
| * | | Add JSON schema validation for job API | Steve Azzopardi | 2018-09-03 | 7 | -6/+61 |
| * | | Add artifact information for job controller | Steve Azzopardi | 2018-09-03 | 1 | -3/+50 |
* | | | Move badge settings to general settings | Winnie Hellmann | 2018-09-03 | 5 | -73/+104 |
* | | | Merge branch '6417-extract-ee-specific-files-lines-for-lib-gitlab-email-handl... | Douwe Maan | 2018-09-03 | 5 | -1/+11 |
|\ \ \ | |||||
| * | | | Add frozen_string_literal: true to email handlers | Sean McGivern | 2018-09-03 | 5 | -0/+10 |
| * | | | Extract EE-specific lines from Gitlab::Email::Handler | Sean McGivern | 2018-09-03 | 1 | -1/+1 |
* | | | | Merge branch 'fix-download-dropdown-link' into 'master' | Nick Thomas | 2018-09-03 | 1 | -1/+13 |
|\ \ \ \ | |||||
| * | | | | Hide PAT creation advice for HTTP clone if PAT exist | George Thomas | 2018-08-31 | 1 | -1/+13 |
* | | | | | Added atom feed for tags | Francisco Javier López | 2018-09-03 | 1 | -0/+69 |
* | | | | | Merge branch '50564-chat-service-refactoring' into 'master' | Nick Thomas | 2018-09-03 | 1 | -0/+50 |
|\ \ \ \ \ | |||||
| * | | | | | Add tests for ChatNotificationService#execute | Takuya Noguchi | 2018-08-31 | 1 | -0/+50 |
* | | | | | | Merge branch 'issue_48084' into 'master' | Sean McGivern | 2018-09-03 | 4 | -0/+67 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Use a serializer to render diff lines | Felipe Artur | 2018-08-31 | 4 | -0/+67 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'sh-fix-dedupe-group-importer' into 'master' | Rémy Coutable | 2018-09-03 | 1 | -1/+4 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Fix importers not assigning a new default group | Stan Hu | 2018-08-31 | 1 | -1/+4 |
| |/ / / / | |||||
* | | | | | Adds Vuex store for the job log page | 🌴🌴 Filipa Lacerda - OOO back on September 17th 🌴🌴 | 2018-09-03 | 3 | -6/+857 |
| |_|_|/ |/| | | | |||||
* | | | | Merge branch 'assert-that-mr-diff-is-highlighted' into 'master' | Grzegorz Bizon | 2018-09-01 | 1 | -1/+2 |
|\ \ \ \ | |||||
| * | | | | Add spec to ensure MR diffs are highlighted | Sean McGivern | 2018-08-29 | 1 | -1/+2 |
* | | | | | Merge branch 'feature/#32877-add-default-field-branch-api' into 'master' | Robert Speicher | 2018-09-01 | 1 | -0/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Fix tests | Riccardo Padovani | 2018-08-18 | 1 | -0/+2 |
* | | | | | | Merge branch '50365_fix_fast_spec_helper' into 'master' | Robert Speicher | 2018-09-01 | 2 | -2/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Move fixture_path out of support/rspec file which is used by fast_spec_helper... | Thong Kuah | 2018-08-31 | 2 | -2/+1 |
* | | | | | | | Merge branch 'sh-fix-confidential-note-option' into 'master' | Robert Speicher | 2018-08-31 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | Fix "Confidential comments" button not saving in project hookssh-fix-confidential-note-option | Stan Hu | 2018-08-17 | 1 | -0/+1 |
* | | | | | | | Merge branch '47765-group-visibility-error-due-to-string-conversion' into 'ma... | Douwe Maan | 2018-08-31 | 1 | -0/+10 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Changes update_column to update_attributes in ProjectTreeRestorer#restore_pro... | Tiago Botelho | 2018-08-28 | 1 | -0/+10 |
* | | | | | | | | Merge branch '37356-relative-submodule-link' into 'master' | Douwe Maan | 2018-08-31 | 1 | -20/+55 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Allow resolving git submodule url for subgroup projects using relative path37356-relative-submodule-link | Mark Chao | 2018-08-20 | 1 | -20/+55 |
* | | | | | | | | | Fixed IDE file row jumping into view on hover | Phil Hughes | 2018-08-31 | 1 | -0/+21 |
* | | | | | | | | | Merge branch 'reorganize-issues-and-mrs-feature-specs' into 'master' | Sean McGivern | 2018-08-31 | 28 | -0/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Reorganize issues and merge request feature specs in the same folder | Rémy Coutable | 2018-08-30 | 28 | -0/+0 |
* | | | | | | | | | | Merge branch 'winh-fix-pdf-page-spec-timing' into 'master' | Filipa Lacerda | 2018-08-31 | 1 | -35/+27 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |||||
| * | | | | | | | | | Remove waiting from PDF page component test | Winnie Hellmann | 2018-08-23 | 1 | -35/+27 |
* | | | | | | | | | | Merge branch 'ide-multiple-file-uploads' into 'master' | Filipa Lacerda | 2018-08-30 | 1 | -0/+17 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Enabled multiple uploads in the Web IDE | Phil Hughes | 2018-08-29 | 1 | -0/+17 |
* | | | | | | | | | | Allow whitelisting for "external collaborator by default" setting | Roger Rüttimann | 2018-08-30 | 10 | -0/+378 |
* | | | | | | | | | | Fixed project logo when it is LFS tracked | Francisco Javier López | 2018-08-30 | 3 | -96/+147 |
| |_|_|_|_|/ / / / |/| | | | | | | | | |||||
* | | | | | | | | | Merge branch '41292-users-stuck-on-a-redirect-loop-after-transferring-project... | Sean McGivern | 2018-08-30 | 1 | -0/+29 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | fix path bug and update specs | James Lopez | 2018-08-30 | 1 | -2/+3 |
| * | | | | | | | | | add specs replicating transfer issue | James Lopez | 2018-08-29 | 1 | -0/+28 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch '50414-rubocop-rule-to-enforce-class-methods-over-module' into '... | Sean McGivern | 2018-08-30 | 1 | -0/+98 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Minor renames for clarity | Jacopo | 2018-08-29 | 1 | -1/+1 |
| * | | | | | | | | | Handles when ClassMethods is used inside a class | Jacopo | 2018-08-29 | 1 | -0/+11 |
| * | | | | | | | | | Applies rule only when extending ActiveSupport::Concern | Jacopo | 2018-08-29 | 1 | -1/+22 |
| * | | | | | | | | | Adds Rubocop rule to enforce class_methods over module ClassMethods | Jacopo | 2018-08-29 | 1 | -0/+66 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Fix Error 500s due to encoding issues when Wiki hooks fire | Stan Hu | 2018-08-29 | 1 | -0/+12 |
|/ / / / / / / / |