summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* fix spec failurefix/import-encrypt-attsJames Lopez2017-01-301-1/+1
* programmatically remove encrypted attributes. Added relevant spec.James Lopez2017-01-301-0/+9
* rename method and added note to export file spec about new encrypted attributesJames Lopez2017-01-301-2/+2
* fix typoJames Lopez2017-01-301-1/+1
* Ignore encrypted attributes in Import/ExportJames Lopez2017-01-303-7/+11
* update scripts and docs to reference the newly namespaced rake taskrelative-url-assetsMike Greiling2017-01-271-1/+1
* Move Gitlab::Shell and Gitlab::ShellAdapter files to lib/27280-fix-unititalized-constantRémy Coutable2017-01-272-0/+0
* Move ApplicationSetting DEFAULTS to `.defaults` insteadRémy Coutable2017-01-271-2/+2
* Merge branch '26943-fix-user-in-build-presenter' into 'master' Robert Speicher2017-01-272-0/+6
|\
| * Raise Gitlab::View::Presenter::CannotOverrideMethodError if presentee already...26943-fix-user-in-build-presenterRémy Coutable2017-01-252-2/+6
| * Don't override presentee methods for Gitlab::View::Presenter::DelegatedRémy Coutable2017-01-241-1/+3
* | Make sure TraceReader uses Encoding.default_externalfix-trace-reader-encodingLin Jen-Shin2017-01-261-0/+1
* | Merge branch 'refresh-authorizations-fork-join' into 'master' Douwe Maan2017-01-254-0/+116
|\ \
| * | Fix race conditions for AuthorizedProjectsWorkerrefresh-authorizations-fork-joinYorick Peterse2017-01-254-0/+116
* | | Merge branch 'backport-ee-changes-for-build-minutes' into 'master' Grzegorz Bizon2017-01-251-0/+1
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/master' into backport-ee-changes-for-bui...Kamil Trzcinski2017-01-2419-115/+237
| |\ \ \
| * | | | Backport changes introduced by https://gitlab.com/gitlab-org/gitlab-ee/merge_...Kamil Trzcinski2017-01-201-0/+1
* | | | | Merge branch 'dont-persist-application-settings-in-test-env-bis' into 'master' Robert Speicher2017-01-243-34/+16
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Rescue from ActiveRecord::UnknownAttributeError and fallback to fake settingsdont-persist-application-settings-in-test-env-bisRémy Coutable2017-01-232-5/+3
| * | | | Revert "Merge branch 'revert-9cac0317' into 'master' "Grzegorz Bizon2017-01-232-32/+16
* | | | | Merge branch '24833-Allow-to-search-by-commit-hash-within-project' into 'mast...Sean McGivern2017-01-242-1/+31
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Search feature: redirects to commit page if query is commit sha and only comm...YarNayar2017-01-242-1/+13
| * | | | Allows to search within project by commit's hashYarNayar2017-01-241-1/+19
| | |/ / | |/| |
* | | | Merge branch '22619-add-an-email-address-to-unsubscribe-list-header-in-email'...Douwe Maan2017-01-237-46/+103
|\ \ \ \
| * | | | Handles unsubscribe from notifications via emailPawel Chojnacki2017-01-137-46/+103
* | | | | Merge branch '22638-creating-a-branch-matching-a-wildcard-fails' into 'master' Douwe Maan2017-01-231-1/+3
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Allow creating protected branch when it doesn't existPawel Chojnacki2017-01-131-1/+3
* | | | | Merge branch 'feature/success-warning-icons-in-stages-builds' into 'master' Kamil Trzciński2017-01-237-53/+94
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Add a default status const to common status concernGrzegorz Bizon2017-01-181-1/+1
| * | | | Extract compound statuses method in status factoryGrzegorz Bizon2017-01-181-3/+7
| * | | | Use detailed status for failed but allowed buildsGrzegorz Bizon2017-01-121-2/+5
| * | | | Expose methods that match statuses in status factoriesGrzegorz Bizon2017-01-121-15/+10
| * | | | Make it possible to combine extended CI/CD statusesGrzegorz Bizon2017-01-121-6/+12
| * | | | Add extended status for build failed but allowed toGrzegorz Bizon2017-01-111-0/+27
| * | | | Add concrete success warning status to stage factoryGrzegorz Bizon2017-01-114-18/+7
| * | | | Extract abstract success with warnings CI/CD statusGrzegorz Bizon2017-01-114-32/+49
* | | | | Revert "Merge branch 'dont-persist-application-settings-in-test-env' into 'ma...Grzegorz Bizon2017-01-212-16/+32
* | | | | Revert "Merge branch 'backport-fix-load-error' into 'master'"Stan Hu2017-01-211-3/+3
* | | | | Don't define ApplicationSetting defaults in a constantbackport-fix-load-errorRémy Coutable2017-01-201-3/+3
* | | | | Merge branch 'fix/import-users' into 'master' Rémy Coutable2017-01-202-14/+6
|\ \ \ \ \
| * | | | | fix member mapper specfix/import-usersJames Lopez2017-01-201-2/+0
| * | | | | fix typoJames Lopez2017-01-191-1/+1
| * | | | | fix and refactor note user mappingJames Lopez2017-01-182-9/+3
| * | | | | added spec replicating the problemJames Lopez2017-01-181-1/+1
| * | | | | do not map usersat all unless adminJames Lopez2017-01-181-2/+2
* | | | | | Merge branch 'dont-persist-application-settings-in-test-env' into 'master' Robert Speicher2017-01-202-32/+16
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Don't persist ApplicationSetting in test envdont-persist-application-settings-in-test-envRémy Coutable2017-01-152-4/+16
| * | | | | Move default values to ApplicationSetting::DEFAULTS and use it in CurrentSett...Rémy Coutable2017-01-151-29/+1
* | | | | | Merge branch 'feature/gitaly-feature-flag' into 'master' Robert Speicher2017-01-191-1/+8
|\ \ \ \ \ \
| * | | | | | Pass Gitaly resource path to gitlab-workhorse if Gitaly is enabledfeature/gitaly-feature-flagAhmad Sherif2017-01-181-1/+8
| | |_|_|_|/ | |/| | | |
View Lorry Controller Status