summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* added changelog39367-fix-new-email-session-pathBrett Walker2017-12-041-0/+5
* remove ambiguity about which resource type to be using for new sessionsBrett Walker2017-12-046-11/+11
* Merge branch '39869_show_closed_status_of_links_to_issues_on_wiki_pages' into...Robert Speicher2017-12-043-2/+13
|\
| * show status of issue links in wiki pagehaseeb2017-12-043-2/+13
|/
* Merge branch 'psimyn-issue-note-refac' into 'master'Fatih Acet2017-12-0421-78/+77
|\
| * issue note component renameSimon Knox2017-12-0421-78/+77
|/
* Merge branch 'git-fsck-worker-client-prep' into 'master'Douwe Maan2017-12-042-11/+17
|\
| * Move SingleRepositoryWorker#fsck into Gitlab::Git::RepositoryKim "BKC" Carlbäcker2017-12-042-11/+17
* | Merge branch 'zj-diverging-commit-count-no-rugged' into 'master'Robert Speicher2017-12-041-1/+1
|\ \
| * | Use commit finder instead of rev parseZeger-Jan van de Weg2017-12-011-1/+1
* | | Merge branch 'sh-optimize-groups-api' into 'master'Douwe Maan2017-12-0418-32/+241
|\ \ \
| * | | Fixed bugsh-optimize-groups-apiFrancisco Lopez2017-12-042-2/+17
| * | | Moving query to base count serviceFrancisco Lopez2017-12-043-8/+4
| * | | Not forcing to redefine preload_relationFrancisco Lopez2017-12-011-1/+1
| * | | Using map to retrieve the element ids because of some issues with mysqlFrancisco Lopez2017-12-013-4/+9
| * | | Fixed testFrancisco Lopez2017-12-011-2/+1
| * | | Undoing the change to ForkNetworkMemberFrancisco Lopez2017-12-012-12/+11
| * | | Fixed BasicProjectDetail parentFrancisco Lopez2017-12-011-1/+1
| * | | Removed binding.pryFrancisco Lopez2017-12-011-1/+0
| * | | Removing blank lineFrancisco Lopez2017-12-011-1/+0
| * | | Changes after rebaseFrancisco Lopez2017-12-011-3/+14
| * | | Undoing debugging changeFrancisco Lopez2017-12-011-2/+2
| * | | Comments from code review applied. Also switched forked_from_project and Fork...Francisco Lopez2017-12-0112-73/+96
| * | | Refactored /projects and /user/:user_id/projects endpointsFrancisco Lopez2017-12-014-25/+77
| * | | Code review comments appliedFrancisco Lopez2017-12-013-4/+12
| * | | Small renamingFrancisco Lopez2017-12-011-4/+4
| * | | More preloading improvement and added batch count servicesFrancisco Lopez2017-12-016-7/+88
| * | | Fix CHANGELOG entry to mention all associations, not just fork networksStan Hu2017-12-011-1/+1
| * | | Preload project route to avoid N+1 queryStan Hu2017-12-011-1/+1
| * | | Only serialize namespace essentials in group's projects API responseStan Hu2017-12-011-2/+4
| * | | Omit the `all` call after Project#project_group_links to avoid unnecessary loadsStan Hu2017-12-011-1/+1
| * | | Optimize API /groups/:id/projects by preloading associationsStan Hu2017-12-013-0/+20
* | | | Merge branch '40691-upgrade-rails-to-4-2-10' into 'master'Douwe Maan2017-12-043-41/+42
|\ \ \ \
| * | | | Stop calling #strip in a commit title in Notify specs40691-upgrade-rails-to-4-2-10Rémy Coutable2017-12-011-2/+2
| * | | | Update Rails to 4.2.10Rémy Coutable2017-12-012-39/+40
| |/ / /
* | | | Merge branch 'gollum-initializer-warning' into 'master'Rémy Coutable2017-12-041-0/+4
|\ \ \ \
| * | | | Add notice to gollum initializergollum-initializer-warningJacob Vosmaer2017-12-041-0/+4
* | | | | Merge branch 'fix-parser-warning' into 'master'Rémy Coutable2017-12-041-2/+2
|\ \ \ \ \
| * | | | | Update parser gem to remove warning about wrong ruby versionGabriel Mazetto2017-12-041-2/+2
* | | | | | Merge branch 'rc/followup-40690' into 'master'Sean McGivern2017-12-041-15/+0
|\ \ \ \ \ \
| * | | | | | Remove seed file from the development envrc/followup-40690Rémy Coutable2017-12-041-15/+0
* | | | | | | Merge branch 'bvl-port-of-ee-translations' into 'master'Douwe Maan2017-12-0410-338/+2861
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Merge branch 'master-i18n' into 'master'Douwe Maan2017-12-0410-338/+2861
* | | | | | | Merge branch '38862-email-notifications-not-sent-as-expected' into 'master'Douwe Maan2017-12-043-6/+41
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fix watch level for mentions in descriptionSean McGivern2017-12-043-6/+41
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch '40770-doc-elasticsearch' into 'master'Rémy Coutable2017-12-043-2/+7
|\ \ \ \ \ \
| * | | | | | Fix typo in docs about ElasticsearchTakuya Noguchi2017-12-033-2/+7
| |/ / / / /
* | | | | | Merge branch '40711-fix-forking-hashed-projects' into 'master'Douwe Maan2017-12-048-72/+61
|\ \ \ \ \ \
| * | | | | | Fix the fork project functionality for projects with hashed storageNick Thomas2017-12-048-72/+61
| |/ / / / /
* | | | | | Merge branch 'docs/mermaid-gl-version' into 'master'Achilleas Pipinellis2017-12-041-8/+11
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |