Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add .haml-lint.yml | Rémy Coutable | 2016-09-13 | 1 | -0/+107 |
* | Use haml_lint for views linting | Rémy Coutable | 2016-09-13 | 4 | -0/+12 |
* | Merge branch '22057-fix-api-ossues-sorting-flaky-specs' into 'master' | Stan Hu | 2016-09-13 | 3 | -0/+8 |
|\ | |||||
| * | Ensure specs on sorting of issues in API are deterministic on MySQL22057-fix-api-ossues-sorting-flaky-specs | Paco Guzman | 2016-09-12 | 3 | -0/+8 |
* | | Merge branch 'rails-5-backports' into 'master' | Robert Speicher | 2016-09-12 | 2 | -7/+3 |
|\ \ | |||||
| * | | No need for this variable. | Connor Shea | 2016-09-12 | 1 | -6/+1 |
| * | | Remove x-json mime_type, rename to json_mime_types.rails-5-backports | Connor Shea | 2016-09-11 | 1 | -3/+2 |
| * | | Fix two problematic bits of code that will be deprecated or broken in Rails 5. | Connor Shea | 2016-09-05 | 2 | -7/+9 |
* | | | Merge branch 'update-templates' into 'master' | Robert Speicher | 2016-09-12 | 13 | -5/+82 |
|\ \ \ | |||||
| * | | | Update templates.update-templates | Ruben Davila | 2016-09-01 | 13 | -5/+82 |
* | | | | Merge branch '21569-dont-add-created-by-for-matched-users' into 'master' | Robert Speicher | 2016-09-12 | 8 | -6/+42 |
|\ \ \ \ | |||||
| * | | | | Only add the original author if there isn't a linked GitLab account | Andrew Smith | 2016-09-08 | 8 | -6/+42 |
* | | | | | Merge branch 'document-custom-event-tracking' into 'master' | Achilleas Pipinellis | 2016-09-12 | 1 | -0/+15 |
|\ \ \ \ \ | |||||
| * | | | | | Document how to track custom events | Yorick Peterse | 2016-09-12 | 1 | -0/+15 |
* | | | | | | Merge branch '21092-file-execution-flag-is-not-preserved-when-editing-files' ... | Rémy Coutable | 2016-09-12 | 4 | -9/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Simplify a condition in Repository#update_file | Rémy Coutable | 2016-09-12 | 1 | -1/+1 |
| * | | | | | | fixes distinction between renaming a file and updating its content and21092-file-execution-flag-is-not-preserved-when-editing-files | tiagonbotelho | 2016-09-09 | 4 | -9/+7 |
* | | | | | | | Merge branch 'issue_21825' into 'master' | Rémy Coutable | 2016-09-12 | 4 | -0/+46 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add information about user and manual build start to runner as variables | Sergey Gnuskov | 2016-09-09 | 4 | -0/+46 |
* | | | | | | | | Merge branch 'slightly-more-readable' into 'master' | Rémy Coutable | 2016-09-12 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Make the cases clear instead of having guardsslightly-more-readable | Lin Jen-Shin | 2016-09-12 | 1 | -3/+3 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 'sh-defer-resolvable-check' into 'master' | Yorick Peterse | 2016-09-12 | 2 | -1/+3 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Only check :can_resolve permission if the note is resolvablesh-defer-resolvable-check | Stan Hu | 2016-09-12 | 2 | -1/+3 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'rc-api-use-search-globalservice-in-projects-search-api' into 'm... | Rémy Coutable | 2016-09-12 | 2 | -12/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Use Search::GlobalService.new in the `GET /projects/search/:query` endpointrc-api-use-search-globalservice-in-projects-search-api | Rémy Coutable | 2016-09-12 | 2 | -13/+4 |
| * | | | | | | Search should compare only the lowercase versions of the project names | Razzeee | 2016-09-09 | 2 | -1/+2 |
* | | | | | | | Merge branch 'fix-api-sorting' into 'master' | Douwe Maan | 2016-09-12 | 3 | -9/+130 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix API issues sortingfix-api-sorting | Sean McGivern | 2016-09-09 | 3 | -9/+130 |
* | | | | | | | | Merge branch '19359-api-for-notification-settings' into 'master' | Rémy Coutable | 2016-09-12 | 7 | -1/+374 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add notification_settings API calls | Marc Siegfriedt | 2016-09-09 | 7 | -1/+374 |
* | | | | | | | | | Merge branch '21814-fix' into 'master' | Robert Speicher | 2016-09-10 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Pull import sources from Gitlab::ImportSources | Ojas Shirekar | 2016-09-09 | 1 | -1/+1 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'pipelines-finder-spec-fix' into 'master' | Robert Speicher | 2016-09-10 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Improve PipelinesFinder spec so that it does not depend on hard-coded databas...pipelines-finder-spec-fix | Stan Hu | 2016-09-09 | 1 | -2/+3 |
* | | | | | | | | | Merge branch 'enable-pipeline-events-by-default' into 'master' | Robert Speicher | 2016-09-09 | 2 | -0/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Enable pipeline events by defaultenable-pipeline-events-by-default | Lin Jen-Shin | 2016-09-09 | 2 | -0/+2 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'restrict_ldap_return_attributes' into 'master' | Robert Speicher | 2016-09-09 | 4 | -28/+149 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Request only the LDAP attributes we need | Drew Blessing | 2016-09-09 | 4 | -28/+149 |
* | | | | | | | | | | Merge branch 'add-remember-option-u2f' into 'master' | Robert Speicher | 2016-09-09 | 7 | -3/+43 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Pass the remember_me option into the u2f form and support it while authentica...add-remember-option-u2f | DJ Mountney | 2016-09-01 | 7 | -3/+43 |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'rs-changelog-archive' into 'master' | Robert Speicher | 2016-09-09 | 3 | -1689/+1812 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Add changelogs/unreleased/.gitkeep | Robert Speicher | 2016-09-09 | 1 | -0/+0 |
| * | | | | | | | | | | Archive CHANGELOG entries prior to 8.0 in changelogs/archive.md | Robert Speicher | 2016-09-09 | 2 | -1689/+1812 |
* | | | | | | | | | | | Merge branch 'branches-mr-button-permissions' into 'master' | Robert Speicher | 2016-09-09 | 3 | -19/+35 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Hides merge request button on branches pagebranches-mr-button-permissions | Phil Hughes | 2016-09-02 | 3 | -19/+35 |
* | | | | | | | | | | | Merge branch 'workhorse-0.8.1' into 'master' | Robert Speicher | 2016-09-09 | 3 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Use gitlab-workhorse 0.8.1 | Jacob Vosmaer | 2016-09-09 | 3 | -3/+3 |
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'github-avoid-conflicts-with-admin-labels' into 'master' | Rémy Coutable | 2016-09-09 | 5 | -11/+41 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Update CHANGELOG | Douglas Barbosa Alexandre | 2016-09-09 | 1 | -0/+1 |
| * | | | | | | | | | | | Avoid conflict with admin labels when importing GitHub labels | Douglas Barbosa Alexandre | 2016-09-09 | 4 | -11/+40 |
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | |