summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Rails prefers require_dependency so that it won't require twice:avoid-constant-warnings-in-railsLin Jen-Shin2016-08-092-2/+2
* Merge branch '18256-secret-token-docs' into 'master' Rémy Coutable2016-08-083-1/+6
|\
| * Move CHANGELOG entry to middle of current releaseSteve Halasz2016-08-051-1/+1
| * Merge branch 'master' into 18256-secret-token-docsSteve Halasz2016-08-05100-421/+989
| |\
| * | Document that webhook secret token is sent in X-Gitlab-Token HTTP headerSteve Halasz2016-08-033-1/+6
* | | Merge branch 'backport-user-select-fix' into 'master' Rémy Coutable2016-08-081-16/+22
|\ \ \
| * | | fix: respect data-attribute 'skip-users' in user_selectsbackport-user-select-fixRik de Groot2016-08-051-16/+22
* | | | Merge branch 'simplify_intro_features_doc' into 'master' Achilleas Pipinellis2016-08-0821-58/+55
|\ \ \ \
| * | | | Simplify feature introduction notesimplify_intro_features_docAchilleas Pipinellis2016-08-0821-58/+55
|/ / / /
* | | | Merge branch 'doc-location-guidelines' into 'master' Achilleas Pipinellis2016-08-061-5/+60
|\ \ \ \
| * | | | Add doc guidelines on documents naming and locationdoc-location-guidelinesAchilleas Pipinellis2016-08-031-5/+60
* | | | | Merge branch 'development-docs-from-gdk' into 'master' Achilleas Pipinellis2016-08-061-4/+26
|\ \ \ \ \
| * | | | | Add 'run tests' docs from GDKJacob Vosmaer2016-08-051-4/+26
| | |/ / / | |/| | |
* | | | | Merge branch 'repository-files-doc' into 'master' Achilleas Pipinellis2016-08-051-0/+16
|\ \ \ \ \
| * | | | | Add examples to repository files API (!5465)winniehell2016-08-051-0/+16
* | | | | | Merge branch 'date-time-to-day-tests' into 'master' Jacob Schatz2016-08-051-0/+31
|\ \ \ \ \ \
| * | | | | | Added tests to dateTime utility getDayName methoddate-time-to-day-testsPhil Hughes2016-07-181-0/+31
* | | | | | | Merge branch 'issuable-dropdowns-changelog' into 'master' Jacob Schatz2016-08-051-0/+3
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Added changelog item for issuable form dropdownsPhil Hughes2016-08-051-0/+3
|/ / / / / /
* | | | | | Merge branch 'ref-switcher-enter-submit' into 'master' Jacob Schatz2016-08-053-20/+61
|\ \ \ \ \ \
| * | | | | | Underscore variable to camelCaseref-switcher-enter-submitPhil Hughes2016-08-041-3/+2
| * | | | | | Fixed issue with `this` not being definedPhil Hughes2016-08-031-2/+2
| * | | | | | Merge branch 'master' into ref-switcher-enter-submitPhil Hughes2016-08-03972-26297/+39264
| |\ \ \ \ \ \
| * | | | | | | Added ref switcher enter key testsPhil Hughes2016-07-191-0/+29
| * | | | | | | Fixed issue with filtering & pressing enter keyPhil Hughes2016-07-191-4/+2
| * | | | | | | Prevent default on link click in ref switcherPhil Hughes2016-07-191-1/+2
| * | | | | | | Improve conditionalAlfredo Sumaran2016-07-181-1/+1
| * | | | | | | Fixed navigational keys not working when filteringPhil Hughes2016-07-181-1/+1
| * | | | | | | Fixed enter submitting form in dropdownPhil Hughes2016-07-182-28/+34
* | | | | | | | Merge branch '19752-pipelines-finished-at' into 'master' Jacob Schatz2016-08-056-8/+64
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Update timeago to shorter representation19752-pipelines-finished-atAnnabel Dunstone2016-08-046-8/+64
* | | | | | | | Merge branch '14202-compare-lazy-load-commits' into 'master' Yorick Peterse2016-08-053-3/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Bump gitlab_git to lazy load compare commits14202-compare-lazy-load-commitsPaco Guzman2016-08-053-3/+4
|/ / / / / / / /
* | | | | | | | Merge branch 'database-guides' into 'master' Achilleas Pipinellis2016-08-052-0/+154
|\ \ \ \ \ \ \ \
| * | | | | | | | Added guide about migrations and downtimedatabase-guidesYorick Peterse2016-08-042-0/+154
* | | | | | | | | Merge branch 'leading-slashes-relative-links' into 'master' Rémy Coutable2016-08-053-1/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Ignore URLs starting with // (!5677)winniehell2016-08-052-1/+3
| * | | | | | | | | Add failing test for #7032winniehell2016-08-051-0/+5
* | | | | | | | | | Merge branch 'add_description_to_plain_text' into 'master' Rémy Coutable2016-08-053-0/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add description to text/plain emailsdixpac2016-08-043-0/+5
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'side-by-side-unfold' into 'master' Douwe Maan2016-08-0515-89/+139
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add unfold links for Side-by-Side viewTim Masliuchenko2016-08-0415-89/+139
* | | | | | | | | | | Merge branch 'upgrade-newrelic-rpm' into 'master' Robert Speicher2016-08-042-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Upgrade newrelic_rpm from 3.14.1.311 to 3.16.0.318.upgrade-newrelic-rpmConnor Shea2016-07-282-3/+3
* | | | | | | | | | | Merge branch '20621-avoid-lame-conflicts-in-ability-allowed' into 'master' Robert Speicher2016-08-041-0/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Move abilities by subject class to a dedicated method20621-avoid-lame-conflicts-in-ability-allowedRémy Coutable2016-08-041-0/+4
* | | | | | | | | | | | Merge branch '20568-fix-member-data-again' into 'master' Douwe Maan2016-08-042-1/+22
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Add missing DOWNTIME constant to the AddTimestampsToMembersAgain migrationNick Thomas2016-08-041-0/+1
| * | | | | | | | | | | Add a data migration to fix some missing timestamps in the members table (again)Nick Thomas2016-08-042-1/+21
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'dz-improve-content-list' into 'master' Dmitriy Zaporozhets2016-08-044-17/+11
|\ \ \ \ \ \ \ \ \ \ \