summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Introduce #find_sidebar and use a constant to find the page14995-custom_wiki_sidebarLin Jen-Shin2018-03-261-0/+7
* Merge branch 'master' into 'latest-security-to-master-21-03-18'James Lopez2018-03-223-4/+4
|\
| * Merge branch '37987-speed-up-pipeline-creation' into 'master'Kamil Trzciński2018-03-221-1/+1
| |\
| | * Add inverse_of: :pipeline for pipeline.builds (#37987)37987-speed-up-pipeline-creationDylan Griffith2018-03-211-1/+1
| * | Backports changes made in https://gitlab.com/gitlab-org/gitlab-ee/merge_reque...ee-5063-to-ce-backportTiago Botelho2018-03-212-3/+3
* | | Merge branch 'fj-15329-services-callbacks-ssrf' into 'security-10-6'Douwe Maan2018-03-2114-37/+29
|/ /
* | Merge branch 'fix-ci-job-auto-retry' into 'master'Grzegorz Bizon2018-03-201-1/+5
|\ \
| * | Prevent auto-retry AccessDenied error from stopping transition to failedTomasz Maczukin2018-03-201-1/+5
* | | Merge branch 'fix/sm/erase_old_trace' into 'master'Kamil Trzciński2018-03-201-2/+1
|\ \ \
| * | | Use update_column than write_attribute and savefix/sm/erase_old_traceShinya Maeda2018-03-191-2/+1
* | | | Merge branch 'issue_25542' into 'master'Sean McGivern2018-03-202-3/+34
|\ \ \ \
| * | | | Improve JIRA event descriptionsissue_25542Felipe Artur2018-03-192-3/+34
| | |/ / | |/| |
* | | | Merge branch '43933-always-notify-mentions' into 'master'Sean McGivern2018-03-191-1/+2
|\ \ \ \
| * | | | Always notify new mentions even if explicitly unsubscribed43933-always-notify-mentionsMario de la Ossa2018-03-191-1/+2
* | | | | Merge branch '31114-internal-ids-are-not-atomic' into 'master'Sean McGivern2018-03-198-5/+180
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Replace public_send calls.Andreas Brandl2018-03-181-3/+3
| * | | | Address review comments.Andreas Brandl2018-03-162-9/+10
| * | | | Only support single scope argument.Andreas Brandl2018-03-161-4/+2
| * | | | Address review comments.Andreas Brandl2018-03-162-17/+15
| * | | | Add shared specs for AtomicInternalId concern.Andreas Brandl2018-03-161-1/+1
| * | | | Backwards-compat for migration specs.Andreas Brandl2018-03-161-2/+18
| * | | | Refactor, extract class and improve comments.Andreas Brandl2018-03-163-37/+90
| * | | | More flexible way of internal id generation.Andreas Brandl2018-03-163-29/+33
| * | | | Atomic generation of internal ids for issues.Andreas Brandl2018-03-164-1/+106
| * | | | Deprecate InternalId concern and rename.Andreas Brandl2018-03-165-5/+5
* | | | | Merge branch 'update-kubeclient' into 'master'Grzegorz Bizon2018-03-192-2/+2
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into 'update-kubeclient'Grzegorz Bizon2018-03-1716-176/+174
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Replace KubeException with Kubeclient::HttpError (kubeclient 3.0)Pirate Praveen2018-03-152-2/+2
* | | | | | Merge branch 'fix/sm/clarify-ambiguous-with_artifacts-implication' into 'master'Kamil Trzciński2018-03-183-6/+6
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Use with_artifacts_archive name. Add specShinya Maeda2018-03-153-6/+6
| * | | | | Add rubocop:disable GitlabSecurity/PublicSendShinya Maeda2018-03-151-1/+1
| * | | | | Clarify ambiguous with_artifacts implicationShinya Maeda2018-03-153-6/+6
* | | | | | Merge branch '41902-add-api-option-to-overwrite-project-description-on-projec...Grzegorz Bizon2018-03-161-2/+2
|\ \ \ \ \ \
| * | | | | | Adds the option to override project description on export via APITiago Botelho2018-03-161-2/+2
| | |_|/ / / | |/| | | |
* | | | | | Merge branch '43522-technical-debt-service-disabled_title' into 'master'Dmitriy Zaporozhets2018-03-163-14/+0
|\ \ \ \ \ \
| * | | | | | Removed unused `Service#disabled_title` methods43522-technical-debt-service-disabled_titleJames Edwards-Jones2018-03-153-14/+0
* | | | | | | Merge branch 'sh-cache-column-exists' into 'master'Yorick Peterse2018-03-161-3/+3
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Cache column_exists? for application settingssh-cache-column-existsStan Hu2018-03-151-3/+3
| | |_|/ / / | |/| | | |
* | | | | | Merge branch '44191-reduce-redis-usage-from-merge-request-diffs-caching' into...Stan Hu2018-03-151-2/+3
|\ \ \ \ \ \
| * | | | | | Only cache highlight results for latest MR diffsSean McGivern2018-03-151-2/+3
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'backstage/gb/refactor-ci-cd-variables-collections' into 'master'42762-project-settings-sections-cannot-be-expanded-after-submission-errorKamil Trzciński2018-03-158-134/+130
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | DRY remaining instances of predefined variablesGrzegorz Bizon2018-03-145-34/+35
| * | | | | Improve predefined variables collection methodsGrzegorz Bizon2018-03-141-11/+10
| * | | | | Port deployment variables skeleton code from EEGrzegorz Bizon2018-03-142-5/+3
| * | | | | Merge branch 'master' into backstage/gb/refactor-ci-cd-variables-collectionsGrzegorz Bizon2018-03-1418-128/+252
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Use new collections to define build predefined variablesGrzegorz Bizon2018-03-131-53/+50
| * | | | | Fix rubocop offense in auto devops predefined variablesGrzegorz Bizon2018-03-131-3/+4
| * | | | | Improve how we handle persistent runner variablesGrzegorz Bizon2018-03-132-9/+1
| * | | | | Make predefined variables in a collection public by defaultGrzegorz Bizon2018-03-131-9/+9
| * | | | | DRY project-level predefined variablesGrzegorz Bizon2018-03-133-16/+16
View Lorry Controller Status