summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-8.17-upgrade-process' into 'master' Alfredo Sumaran2017-02-161-0/+1
|\
| * move "Install node modules" step before "Migrate DB" within update processMike Greiling2017-02-161-1/+1
| * update migration docs for 8.17 to include minimum node versionMike Greiling2017-02-161-0/+1
* | Merge branch 'fix/import-hooks' into 'master' Rémy Coutable2017-02-163-32/+5
|\ \
| * | Use gitlab shell import instead of manually creating the webhooksJames Lopez2017-02-163-32/+5
* | | Merge branch 'snippets-search-performance' into 'master' Yorick Peterse2017-02-161-2/+2
|\ \ \
| * | | Reduce query count for snippet searchsnippets-search-performancePhil Hughes2017-02-161-2/+2
* | | | Merge branch '27873-when-a-commit-appears-in-several-projects-commit-comments...Rémy Coutable2017-02-161-1/+1
|\ \ \ \
| * | | | Ensure only commit comments relevant to target project are returnedMark Fletcher2017-02-151-1/+1
* | | | | Merge branch 'add-auto-submited-header' into 'master'Sean McGivern2017-02-161-0/+8
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Set `Auto-Submitted: auto-generated` header to emailsSemyon Pupkov2017-02-151-0/+8
* | | | | Merge branch 'move_tags_service_to_namespace' into 'master'Rémy Coutable2017-02-151-2/+2
|\ \ \ \ \
| * | | | | Move tag services to `Tags` namespacedixpac2017-02-141-2/+2
* | | | | | Merge branch 'add-missing-api-entities' into 'master'Rémy Coutable2017-02-151-17/+18
|\ \ \ \ \ \
| * | | | | | entities: use the RepoCommit entity for branch commitsBen Boeckel2017-02-141-17/+18
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'fix-github-import-MR-wrong-project' into 'security' Robert Speicher2017-02-151-3/+7
* | | | | | Merge branch 'fix-rdoc-xss' into 'security' Robert Speicher2017-02-151-0/+3
* | | | | | Merge branch 'asciidoctor-xss-patch' into 'security' Robert Speicher2017-02-151-0/+3
| |_|_|/ / |/| | | |
* | | | | Merge branch 'dz-nested-groups-improvements-3' into 'master' Dmitriy Zaporozhets2017-02-156-6/+6
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into 'dz-nested-groups-improvements-3'Dmitriy Zaporozhets2017-02-147-61/+48
| |\ \ \ \ \
| * | | | | | Use Namespace#full_path instead of Namespace#pathDmitriy Zaporozhets2017-02-145-5/+5
| * | | | | | Expose Namespace#full_path in namespaces APIDmitriy Zaporozhets2017-02-141-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'pass_coverage_value_to_commit_status_api' into 'master' Rémy Coutable2017-02-152-2/+4
|\ \ \ \ \ \
| * | | | | | Make it possible to pass coverage value to commit status APIwendy04022017-02-142-2/+4
| | |_|/ / / | |/| | | |
* | | | | | Merge branch '27759-fix-sidekiq_status-client_middleware-issue' into 'master' Robert Speicher2017-02-142-2/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | SidekiqStatus need to be qualified in some cases27759-fix-sidekiq_status-client_middleware-issueRémy Coutable2017-02-142-2/+2
* | | | | | Merge branch 'replace-npm-with-yarn' into 'master' Filipa Lacerda2017-02-142-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | replace npm run calls with yarnMike Greiling2017-02-132-2/+2
* | | | | | API: Consolidate /projects endpointToon Claes2017-02-143-55/+15
| |_|_|/ / |/| | | |
* | | | | Merge branch 'create-connection-pool' into 'master' Yorick Peterse2017-02-141-0/+25
|\ \ \ \ \
| * | | | | Only ensure against yield so that pool should be availablecreate-connection-poolLin Jen-Shin2017-02-141-4/+5
| * | | | | Have some simple way to create connection poolLin Jen-Shin2017-02-141-0/+24
* | | | | | Merge branch '14492-change-fork-endpoint' into 'master'Sean McGivern2017-02-141-1/+1
|\ \ \ \ \ \
| * | | | | | Move /projects/fork/:id to /projects/:id/fork14492-change-fork-endpointOswaldo Ferreira2017-02-131-1/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'fix-ar-connection-leaks' into 'master'Rémy Coutable2017-02-141-1/+1
|\ \ \ \ \ \
| * | | | | | Don't connect in Gitlab::Database.adapter_namefix-ar-connection-leaksYorick Peterse2017-02-131-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch '22645-add-discussion-contribs-to-calendar' into 'master' Sean McGivern2017-02-141-2/+4
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Add comment events to contributions calendar22645-add-discussion-contribs-to-calendarRémy Coutable2017-02-131-2/+4
| | |_|/ / | |/| | |
* | | | | Add GFM support to nested groupsdz-nested-groups-gfm-altDmitriy Zaporozhets2017-02-133-4/+8
| |_|/ / |/| | |
* | | | Merge branch '22818-licence-gitignore-and-yml-endpoints-removal' into 'master' Rémy Coutable2017-02-133-56/+162
|\ \ \ \ | |_|_|/ |/| | |
| * | | Remove deprecated templates endpoints in V422818-licence-gitignore-and-yml-endpoints-removalOswaldo Ferreira2017-02-133-56/+162
| |/ /
* | | Merge branch 'rs-rubocop-rspec' into 'master' Rémy Coutable2017-02-131-1/+1
|\ \ \ | |/ / |/| |
| * | Enable `Lint/EmptyWhen` cop and correct offenseRobert Speicher2017-02-131-1/+1
| |/
* | Merge branch 'fix/cycle-analytics-events-limit' into 'master' Sean McGivern2017-02-131-1/+3
|\ \
| * | move query limit to base event fetcherJames Lopez2017-02-061-1/+3
* | | Merge branch '24976-start-of-line-mention' into 'master' Sean McGivern2017-02-135-9/+73
|\ \ \
| * | | Create directly_addressed Todos when mentioned in beginning of a lineErshad Kunnakkadan2017-02-085-9/+73
* | | | Merge branch '20732_member_exists_409' into 'master'Sean McGivern2017-02-133-10/+138
|\ \ \ \
| * | | | Add member: Always return 409 when a member existsJarka Kadlecova2017-02-103-10/+138
* | | | | Merge branch 'zj-drop-ruby-21-tests' into 'master' Rémy Coutable2017-02-136-11/+9
|\ \ \ \ \
View Lorry Controller Status