summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | | | | Fix NGINX API download regexJacob Vosmaer2015-10-142-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users are allowed to supply namespace%2Fproject instead of a numeric ID
| | * | | | | | | | | | | Let gitlab-git-http-server handle archive downloadsJacob Vosmaer2015-10-084-15/+47
| | | |_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change relies on changes in gitlab_git and gitlab-git-http-server.
| * | | | | | | | | | | Merge branch 'incoming-email-config' into 'master' Robert Speicher2015-10-142-34/+7
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make Reply by email easier to configure Builds on !1566. Omnibus companion MR: gitlab-org/omnibus-gitlab!510 (cc @marin) See merge request !1580
| | * | | | | | | | | | Make Reply by email easier to configureDouwe Maan2015-10-132-34/+7
| | | |/ / / / / / / / | | |/| | | | | | | |
* | | | | | | | | | | Merge branch 'master' into rs-redactor-filterDouwe Maan2015-10-1517-7/+235
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | / / | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Merge branch 'simplify-cross-references' into 'master' Robert Speicher2015-10-141-0/+2
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify code around (cross)-references See merge request !1568
| | * | | | | | | | Simplify code around (cross)-referencesDouwe Maan2015-10-121-0/+2
| | |/ / / / / / /
| * | | | | | | | Fix: Images cannot show when projects' path was changeduploads_path_fixValery Sizov2015-10-143-0/+84
| | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Merge remote-tracking branch 'origin/cernvcs_hide_passwrd'Valery Sizov2015-10-142-1/+13
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'feature/api_hide_service_password' of gitlab.com:cernvcs/gitlab-cecernvcs_hide_passwrdValery Sizov2015-10-142-1/+13
| | |\ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | | * | | | | | Hide passwords to non-admin users in the services APIAlex Lossent2015-10-122-1/+13
| | | | |_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | In order to be consistent with !1490 doing it for the web interface
| * | | | | | | Merge remote-tracking branch 'origin/inified_404_error'Valery Sizov2015-10-141-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Only render 404 page from /publicinified_404_errorValery Sizov2015-10-131-1/+1
| | |/ / / / /
| * | | | | | [ci skip] Fix wrong commentsue4452015-10-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to `attributes_for_keys` and API doc, `POST /projects/:id/merge_requests` is received `target_project_id` (NOT `target_project`)
| * | | | | | Fix broken testsKamil Trzcinski2015-10-121-1/+1
| | | | | | |
| * | | | | | Fix some changesKamil Trzcinski2015-10-121-1/+1
| | | | | | |
| * | | | | | Update renderingKamil Trzcinski2015-10-121-1/+1
| | | | | | |
| * | | | | | Small bug fixesKamil Trzcinski2015-10-121-2/+3
| | | | | | |
| * | | | | | Add Commit Status documentationKamil Trzcinski2015-10-121-10/+10
| | | | | | |
| * | | | | | Add author to statusesKamil Trzcinski2015-10-122-1/+2
| | | | | | |
| * | | | | | Fix commit status POST URLKamil Trzcinski2015-10-121-1/+1
| | | | | | |
| * | | | | | Implement Commit Status APIKamil Trzcinski2015-10-124-3/+89
| |/ / / / /
| * | | | | Merge branch 'fix_email_downcasing' into 'master' Robert Speicher2015-10-111-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LDAP email address downcasing Fixes #2960 In the event we cannot match an LDAP user by DN we attempt to find an identity by email address and then update the DN. In this case the identity is matched by email address. If the user's email address in LDAP has an upper case character we cannot find a match in the GitLab database. GitLab downcases emails before the user object is saved. This merge request downcases the email from LDAP before we lookup by email. I also added a test to prevent a regression. See merge request !1550
| | * | | | Fix ldap email downcasing bugDrew Blessing2015-10-081-1/+1
| | | | | |
| * | | | | Merge branch 'rs-issue-2970' into 'master' Douwe Maan2015-10-091-1/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Normalize space-like characters in keys before output to gitlab-shell gitlab-shell expects only one tab separator per key, and an SSH key with a tab character in the comment, for example, would break things. Closes #2970 See merge request !1552
| | * | | | | Normalize space-like characters in keys before output to gitlab-shellrs-issue-2970Robert Speicher2015-10-081-1/+2
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitlab-shell expects only one tab separator per key, and an SSH key with a tab character in the comment, for example, would break things. Closes #2970
| * | | | | Merge branch 'rs-2fa-task' into 'master' Jacob Vosmaer2015-10-091-0/+23
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add task to disable 2FA for all users Addresses #2971 See merge request !1532
| | * | | | Add output and confirmation to gitlab:two_factor:disable_for_all_usersrs-2fa-taskRobert Speicher2015-10-081-2/+15
| | | | | |
| | * | | | Add gitlab:two_factor:disable_for_all_users taskRobert Speicher2015-10-071-0/+10
| | |/ / /
| * | | | Added dedicated Rake task for setting up PostgresYorick Peterse2015-10-082-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | This ensures any PostgreSQL specific schema changes (e.g. expression indexes) are created when setting up the database.
| * | | | Added methods for detecting MySQL/PostgreSQLYorick Peterse2015-10-071-0/+11
| |/ / / | | | | | | | | | | | | | | | | These two methods remove the need for manually going into ActiveRecord::Base.connection all over the place.
* | | | Explicitly only parse references by specified filterDouwe Maan2015-10-142-2/+8
| | | |
* | | | Have Issue#participants load all users mentioned in notes using a single queryDouwe Maan2015-10-141-10/+11
| | | |
* | | | Code cleanupDouwe Maan2015-10-133-23/+17
| | | |
* | | | Allow ReferenceExtractor to efficiently load references from multiple texts ↵Douwe Maan2015-10-133-12/+29
| | | | | | | | | | | | | | | | at once
* | | | Efficiently load multiple references of one type.Douwe Maan2015-10-137-23/+33
| | | |
* | | | Pass project to RedactorFilterDouwe Maan2015-10-132-4/+9
| | | |
* | | | Raise error when a ReferenceFilter doesn't implement referenced_byDouwe Maan2015-10-081-1/+1
| | | |
* | | | Update inline docDouwe Maan2015-10-081-2/+2
| | | |
* | | | Update ReferenceFilter docsRobert Speicher2015-10-071-10/+9
| | | | | | | | | | | | | | | | [ci skip]
* | | | Always allow references to the current projectDouwe Maan2015-10-074-5/+8
| | | |
* | | | Refactor reference gathering to use a dedicated filterDouwe Maan2015-10-0712-89/+169
| | | |
* | | | Merge branch 'master' into rs-redactor-filterDouwe Maan2015-10-0776-225/+2524
|\ \ \ \ | |/ / /
| * | | Merge branch 'rs-remove-ci-disable'Kamil Trzcinski2015-10-052-10/+0
| |\ \ \ | | | | | | | | | | | | | | | See merge request !1512
| | * | | Remove the option to disable CIrs-remove-ci-disableRobert Speicher2015-10-052-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This option only existed to ease the CI-to-CE/EE migration process. This commit partially reverts 8b05abe816b0c681ac218096b294311dd04fde8b
| * | | | Merge branch 'refactor-build-service' into 'master' Kamil Trzciński2015-10-052-3/+4
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor Ci::Commit and Ci::Build to have all builds for same :sha on single page This makes Ci::Commit to have only :sha and simplifies routing to have only :sha in path. The :ref and :push_data is now parameter of Ci::Build. All commit related data (git author, message and .gitlab-ci.yml) is read directly from repository. All code related for creating builds is moved to CreateBuildsService. Status deduction is rewritten to make if more efficient and easier to integrate with Commit Status API. This is partially working, tests are not yet touched. This slightly changes view of Commit: ![Screen_Shot_2015-10-02_at_15.21.47](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ad3f1ccdcc87659ea437d8db6c5b9f94/Screen_Shot_2015-10-02_at_15.21.47.png) @dzaporozhets What do you think? See merge request !1502
| | * | | Fix next round of testsKamil Trzcinski2015-10-051-1/+1
| | | | |
| | * | | Make commit_spec runKamil Trzcinski2015-10-051-2/+2
| | | | |
| | * | | Add user to Ci::Build to have pusher email addressKamil Trzcinski2015-10-051-1/+1
| | | | |
| | * | | Refactor commit and buildKamil Trzcinski2015-10-051-0/+1
| | | | |
View Lorry Controller Status