summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix/import-pending-user' into 'master' Rémy Coutable2016-08-081-5/+8
|\
| * Support pending invitation project members importing projectsJames Lopez2016-08-081-5/+8
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-08-081-1/+2
|\ \ | |/
| * Ignore URLs starting with // (!5677)winniehell2016-08-051-1/+2
* | Merge branch '14898-protected-branches-developer-can-not-push-without-permiss...Douwe Maan2016-08-051-0/+2
|\ \ | |/ |/|
| * changes default_branch_protection to allow devs_can_merge protection option a...tiagonbotelho2016-08-041-0/+2
* | Merge branch 'master' of https://dev.gitlab.org/gitlab/gitlabhqRémy Coutable2016-08-041-1/+3
|\ \
| * \ Merge branch '20527-fork-commits-have-impact-on-original-project' into 'master' Rémy Coutable2016-08-041-1/+3
| |\ \
| | * | Don’t close issues on original project from a forkPaco Guzman2016-08-041-1/+3
* | | | Merge branch '20512-fix-rename-add-users-into-project-to-add-users-to-project...Rémy Coutable2016-08-042-8/+8
|\ \ \ \ | |/ / / |/| | |
| * | | Fix Rename `add_users_into_project` and `projects_ids`Herminio Torres2016-08-042-8/+8
* | | | Merge branch 'fix/ha-mode-import-issue' into 'master' Rémy Coutable2016-08-041-0/+4
|\ \ \ \ | |/ / / |/| | |
| * | | using shared path for project import uploads and refactored gitlab remove exp...James Lopez2016-08-041-0/+4
* | | | Merge branch 'syntax-highlight-filter-performance' into 'master' Rémy Coutable2016-08-041-8/+18
|\ \ \ \
| * | | | Improve performance of SyntaxHighlightFiltersyntax-highlight-filter-performanceYorick Peterse2016-08-031-8/+18
* | | | | Merge branch 'fix/import-error' into 'master' Rémy Coutable2016-08-041-1/+1
|\ \ \ \ \
| * | | | | Fix Import/Export error checking versionsfix/import-errorJames Lopez2016-08-031-1/+1
| |/ / / /
* | | | | Merge branch 'autolink-filter-text-parse' into 'master' Rémy Coutable2016-08-041-6/+9
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Improve AutolinkFilter#text_parse performanceautolink-filter-text-parseYorick Peterse2016-08-031-6/+9
| |/ / /
* | | | Merge branch 'update-gitlab-shell-in-tests' into 'master' Robert Speicher2016-08-031-2/+8
|\ \ \ \
| * | | | Update the gitlab-shell version in the tmp/tests directory to the right versionupdate-gitlab-shell-in-testsStan Hu2016-08-031-2/+8
| |/ / /
* | | | Make Compare#diffs diff_options a regular argumentDouwe Maan2016-08-031-1/+1
* | | | switch from diff_file_collection to diffs20034-safe-diffsPaco Guzman2016-08-038-44/+24
* | | | Introduce Compare model in the codebase.Paco Guzman2016-08-035-17/+19
* | | | Move to Gitlab::Diff::FileCollectionPaco Guzman2016-08-037-5/+162
* | | | Cache highlighted diff lines for merge requestsPaco Guzman2016-08-034-5/+23
|/ / /
* | | Merge branch 'fix-downtime-check-compare-with-branch' into 'master' Yorick Peterse2016-08-021-20/+6
|\ \ \
| * | | Always compare with FETCH_HEAD in downtime_checkYorick Peterse2016-08-021-20/+6
| |/ /
* | | fix TODO comment [ci skip]James Lopez2016-08-021-1/+1
|/ /
* | Add support for relative links starting with ./ or / to RelativeLinkFilter (!...winniehell2016-08-021-0/+3
|/
* Catch what warden might throw when profiling requests to re-throw itfix/request-profiler-error-when-unauthenticatedAhmad Sherif2016-08-011-2/+8
* Merge branch 'fix/request-profiler-middleware-error-on-reload' into 'master' Douwe Maan2016-08-011-0/+1
|\
| * Fix RequestProfiler::Middleware error when code is reloaded in developmentfix/request-profiler-middleware-error-on-reloadAhmad Sherif2016-08-011-0/+1
* | Merge branch 'fix/use-fewer-queries-for-ci-charts' into 'master' Douwe Maan2016-08-011-26/+70
|\ \
| * | Use fewer queries for CI chartsfix/use-fewer-queries-for-ci-chartsAhmad Sherif2016-07-271-26/+70
* | | Merge branch 'fix/importing-io-timing-issue' into 'master' Rémy Coutable2016-08-011-1/+17
|\ \ \
| * | | refactored wait_for_archived_file methodfix/importing-io-timing-issueJames Lopez2016-08-011-6/+4
| * | | fix return value and specJames Lopez2016-08-011-1/+1
| * | | squashed - fix timing issues in prod importing projectsJames Lopez2016-08-011-1/+19
* | | | Merge branch '20473-rails-queue-duration' into 'master' Yorick Peterse2016-08-011-2/+1
|\ \ \ \
| * | | | Gitlab::Metrics.current_transaction needs to be public for RailsQueueDurationPaco Guzman2016-08-011-2/+1
| | |_|/ | |/| |
* | | | Trim extra displayed carriage returns in diffs and files with CRLFsStan Hu2016-08-011-1/+1
|/ / /
* | | Merge branch 'fix/labels-milestones-import' into 'master' Rémy Coutable2016-08-016-93/+173
|\ \ \
| * | | squashed - fixed label and milestone association problems, updated specs and ...fix/labels-milestones-importJames Lopez2016-08-016-93/+173
| |/ /
* | | Merge branch 'zj-env-external-url' into 'master' Rémy Coutable2016-08-013-0/+92
|\ \ \ | |/ / |/| |
| * | Minor fixes in the Env API endpointszj-env-external-urlZ.J. van de Weg2016-08-011-1/+5
| * | Use Grape DSL for environment endpointsZ.J. van de Weg2016-07-292-48/+47
| * | Incorporate feedbackZ.J. van de Weg2016-07-291-4/+1
| * | Add API support for environmentsZ.J. van de Weg2016-07-293-0/+92
* | | Merge branch 'fix/import-project-hooks' into 'master' Douwe Maan2016-07-292-1/+19
|\ \ \
View Lorry Controller Status