summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Removed horizontal overflow from collapsed issuable sidebar21895-horizontal-scroll-bar-present-in-collapsed-sidebarLuke Bennett2016-09-121-1/+1
* Merge branch '21814-fix' into 'master' Robert Speicher2016-09-101-1/+1
|\
| * Pull import sources from Gitlab::ImportSourcesOjas Shirekar2016-09-091-1/+1
* | Merge branch 'pipelines-finder-spec-fix' into 'master' Robert Speicher2016-09-101-2/+3
|\ \
| * | Improve PipelinesFinder spec so that it does not depend on hard-coded databas...pipelines-finder-spec-fixStan Hu2016-09-091-2/+3
* | | Merge branch 'enable-pipeline-events-by-default' into 'master' Robert Speicher2016-09-092-0/+2
|\ \ \
| * | | Enable pipeline events by defaultenable-pipeline-events-by-defaultLin Jen-Shin2016-09-092-0/+2
* | | | Merge branch 'restrict_ldap_return_attributes' into 'master' Robert Speicher2016-09-094-28/+149
|\ \ \ \
| * | | | Request only the LDAP attributes we needDrew Blessing2016-09-094-28/+149
* | | | | Merge branch 'add-remember-option-u2f' into 'master' Robert Speicher2016-09-097-3/+43
|\ \ \ \ \
| * | | | | Pass the remember_me option into the u2f form and support it while authentica...add-remember-option-u2fDJ Mountney2016-09-017-3/+43
* | | | | | Merge branch 'rs-changelog-archive' into 'master' Robert Speicher2016-09-093-1689/+1812
|\ \ \ \ \ \
| * | | | | | Add changelogs/unreleased/.gitkeepRobert Speicher2016-09-091-0/+0
| * | | | | | Archive CHANGELOG entries prior to 8.0 in changelogs/archive.mdRobert Speicher2016-09-092-1689/+1812
* | | | | | | Merge branch 'branches-mr-button-permissions' into 'master' Robert Speicher2016-09-093-19/+35
|\ \ \ \ \ \ \
| * | | | | | | Hides merge request button on branches pagebranches-mr-button-permissionsPhil Hughes2016-09-023-19/+35
* | | | | | | | Merge branch 'workhorse-0.8.1' into 'master' Robert Speicher2016-09-093-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Use gitlab-workhorse 0.8.1Jacob Vosmaer2016-09-093-3/+3
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'github-avoid-conflicts-with-admin-labels' into 'master' Rémy Coutable2016-09-095-11/+41
|\ \ \ \ \ \ \ \
| * | | | | | | | Update CHANGELOGDouglas Barbosa Alexandre2016-09-091-0/+1
| * | | | | | | | Avoid conflict with admin labels when importing GitHub labelsDouglas Barbosa Alexandre2016-09-094-11/+40
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch '20300-restore-comments' into 'master' Jacob Schatz2016-09-0989-139/+952
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Require comments must be included before codeJared Deckard2016-09-082-8/+5
| * | | | | | | Restore comments lost when converting CoffeeScript to JavaScriptJared Deckard2016-09-0889-142/+958
* | | | | | | | Merge branch 'zj-update-ci-examples-doc' into 'master' Achilleas Pipinellis2016-09-091-6/+8
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Minor update on CI docs exampleszj-update-ci-examples-docZ.J. van de Weg2016-09-091-6/+8
* | | | | | | | Merge branch 'gitlab-workhorse-safeties' into 'master' Jacob Vosmaer (GitLab)2016-09-0916-19/+213
|\ \ \ \ \ \ \ \
| * | | | | | | | Use gitlab-workhorse 0.8.0Jacob Vosmaer2016-09-083-3/+3
| * | | | | | | | Constants in specsJacob Vosmaer2016-09-062-2/+2
| * | | | | | | | Verify JWT messages from gitlab-workhorseJacob Vosmaer2016-09-0513-16/+210
* | | | | | | | | Merge branch 'slash-commands-issuable-spec-fix' into 'master' Rémy Coutable2016-09-095-60/+44
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Move write_note into SlashCommandsHelper and update other dependent specsslash-commands-issuable-spec-fixStan Hu2016-09-084-21/+24
| * | | | | | | | | Wait for logout message in login_helpersStan Hu2016-09-081-0/+1
| * | | | | | | | | Use wait_for_ajax to avoid database deadlocks after specs are cleanedStan Hu2016-09-081-0/+7
| * | | | | | | | | Fix spec failures with spec/features/issues/user_uses_slash_commands_spec.rbStan Hu2016-09-081-48/+21
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch '21714-refresh-the-todos-count-cache-after-issuable-delete' into...Rémy Coutable2016-09-096-0/+51
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update CHANGELOG21714-refresh-the-todos-count-cache-after-issuable-deleteDouglas Barbosa Alexandre2016-09-081-0/+1
| * | | | | | | | | Refresh todos count cache when an Issue/MR is deletedDouglas Barbosa Alexandre2016-09-085-0/+50
| |/ / / / / / / /
* | | | | | | | | Merge branch 'sidekiq-ps-parsing' into 'master' Rémy Coutable2016-09-094-6/+62
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Remove original regexpPascal Betz2016-09-081-9/+7
| * | | | | | | | Reformat Regexp Pascal Betz2016-09-083-3/+18
| * | | | | | | | feedback code reviewPascal Betz2016-09-083-2/+3
| * | | | | | | | Move parsing of sidekiq ps into helperPascal Betz2016-09-073-8/+50
* | | | | | | | | Merge branch 'support-long-branch-namers' into 'master' Annabel Dunstone Gray2016-09-082-3/+10
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Give project selection dropdowns responsive width, long-names wrap.support-long-branch-namersBryce2016-09-022-3/+10
* | | | | | | | | Merge branch 'smart-pipeline-duration' into 'master' Rémy Coutable2016-09-086-6/+300
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Struct.new could take a block for defining methods, feedback:smart-pipeline-durationLin Jen-Shin2016-09-081-2/+1
| * | | | | | | | Split try_merge_period into overlap? and merge:Lin Jen-Shin2016-09-081-7/+9
| * | | | | | | | Just use string interpolation, feedback:Lin Jen-Shin2016-09-071-2/+1
| * | | | | | | | Be more specific since it's not needed to be generic now,Lin Jen-Shin2016-09-061-3/+5