Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Removed horizontal overflow from collapsed issuable sidebar21895-horizontal-scroll-bar-present-in-collapsed-sidebar | Luke Bennett | 2016-09-12 | 1 | -1/+1 |
* | Merge branch '21814-fix' into 'master' | Robert Speicher | 2016-09-10 | 1 | -1/+1 |
|\ | |||||
| * | Pull import sources from Gitlab::ImportSources | Ojas Shirekar | 2016-09-09 | 1 | -1/+1 |
* | | Merge branch 'pipelines-finder-spec-fix' into 'master' | Robert Speicher | 2016-09-10 | 1 | -2/+3 |
|\ \ | |||||
| * | | Improve PipelinesFinder spec so that it does not depend on hard-coded databas...pipelines-finder-spec-fix | Stan Hu | 2016-09-09 | 1 | -2/+3 |
* | | | Merge branch 'enable-pipeline-events-by-default' into 'master' | Robert Speicher | 2016-09-09 | 2 | -0/+2 |
|\ \ \ | |||||
| * | | | Enable pipeline events by defaultenable-pipeline-events-by-default | Lin Jen-Shin | 2016-09-09 | 2 | -0/+2 |
* | | | | Merge branch 'restrict_ldap_return_attributes' into 'master' | Robert Speicher | 2016-09-09 | 4 | -28/+149 |
|\ \ \ \ | |||||
| * | | | | Request only the LDAP attributes we need | Drew Blessing | 2016-09-09 | 4 | -28/+149 |
* | | | | | Merge branch 'add-remember-option-u2f' into 'master' | Robert Speicher | 2016-09-09 | 7 | -3/+43 |
|\ \ \ \ \ | |||||
| * | | | | | Pass the remember_me option into the u2f form and support it while authentica...add-remember-option-u2f | DJ Mountney | 2016-09-01 | 7 | -3/+43 |
* | | | | | | Merge branch 'rs-changelog-archive' into 'master' | Robert Speicher | 2016-09-09 | 3 | -1689/+1812 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add changelogs/unreleased/.gitkeep | Robert Speicher | 2016-09-09 | 1 | -0/+0 |
| * | | | | | | Archive CHANGELOG entries prior to 8.0 in changelogs/archive.md | Robert Speicher | 2016-09-09 | 2 | -1689/+1812 |
* | | | | | | | Merge branch 'branches-mr-button-permissions' into 'master' | Robert Speicher | 2016-09-09 | 3 | -19/+35 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Hides merge request button on branches pagebranches-mr-button-permissions | Phil Hughes | 2016-09-02 | 3 | -19/+35 |
* | | | | | | | | Merge branch 'workhorse-0.8.1' into 'master' | Robert Speicher | 2016-09-09 | 3 | -3/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Use gitlab-workhorse 0.8.1 | Jacob Vosmaer | 2016-09-09 | 3 | -3/+3 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'github-avoid-conflicts-with-admin-labels' into 'master' | Rémy Coutable | 2016-09-09 | 5 | -11/+41 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Update CHANGELOG | Douglas Barbosa Alexandre | 2016-09-09 | 1 | -0/+1 |
| * | | | | | | | | Avoid conflict with admin labels when importing GitHub labels | Douglas Barbosa Alexandre | 2016-09-09 | 4 | -11/+40 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Merge branch '20300-restore-comments' into 'master' | Jacob Schatz | 2016-09-09 | 89 | -139/+952 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Require comments must be included before code | Jared Deckard | 2016-09-08 | 2 | -8/+5 |
| * | | | | | | | Restore comments lost when converting CoffeeScript to JavaScript | Jared Deckard | 2016-09-08 | 89 | -142/+958 |
* | | | | | | | | Merge branch 'zj-update-ci-examples-doc' into 'master' | Achilleas Pipinellis | 2016-09-09 | 1 | -6/+8 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | Minor update on CI docs exampleszj-update-ci-examples-doc | Z.J. van de Weg | 2016-09-09 | 1 | -6/+8 |
* | | | | | | | | Merge branch 'gitlab-workhorse-safeties' into 'master' | Jacob Vosmaer (GitLab) | 2016-09-09 | 16 | -19/+213 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Use gitlab-workhorse 0.8.0 | Jacob Vosmaer | 2016-09-08 | 3 | -3/+3 |
| * | | | | | | | | Constants in specs | Jacob Vosmaer | 2016-09-06 | 2 | -2/+2 |
| * | | | | | | | | Verify JWT messages from gitlab-workhorse | Jacob Vosmaer | 2016-09-05 | 13 | -16/+210 |
* | | | | | | | | | Merge branch 'slash-commands-issuable-spec-fix' into 'master' | Rémy Coutable | 2016-09-09 | 5 | -60/+44 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Move write_note into SlashCommandsHelper and update other dependent specsslash-commands-issuable-spec-fix | Stan Hu | 2016-09-08 | 4 | -21/+24 |
| * | | | | | | | | | Wait for logout message in login_helpers | Stan Hu | 2016-09-08 | 1 | -0/+1 |
| * | | | | | | | | | Use wait_for_ajax to avoid database deadlocks after specs are cleaned | Stan Hu | 2016-09-08 | 1 | -0/+7 |
| * | | | | | | | | | Fix spec failures with spec/features/issues/user_uses_slash_commands_spec.rb | Stan Hu | 2016-09-08 | 1 | -48/+21 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch '21714-refresh-the-todos-count-cache-after-issuable-delete' into... | Rémy Coutable | 2016-09-09 | 6 | -0/+51 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Update CHANGELOG21714-refresh-the-todos-count-cache-after-issuable-delete | Douglas Barbosa Alexandre | 2016-09-08 | 1 | -0/+1 |
| * | | | | | | | | | Refresh todos count cache when an Issue/MR is deleted | Douglas Barbosa Alexandre | 2016-09-08 | 5 | -0/+50 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'sidekiq-ps-parsing' into 'master' | Rémy Coutable | 2016-09-09 | 4 | -6/+62 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Remove original regexp | Pascal Betz | 2016-09-08 | 1 | -9/+7 |
| * | | | | | | | | Reformat Regexp | Pascal Betz | 2016-09-08 | 3 | -3/+18 |
| * | | | | | | | | feedback code review | Pascal Betz | 2016-09-08 | 3 | -2/+3 |
| * | | | | | | | | Move parsing of sidekiq ps into helper | Pascal Betz | 2016-09-07 | 3 | -8/+50 |
* | | | | | | | | | Merge branch 'support-long-branch-namers' into 'master' | Annabel Dunstone Gray | 2016-09-08 | 2 | -3/+10 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | Give project selection dropdowns responsive width, long-names wrap.support-long-branch-namers | Bryce | 2016-09-02 | 2 | -3/+10 |
* | | | | | | | | | Merge branch 'smart-pipeline-duration' into 'master' | Rémy Coutable | 2016-09-08 | 6 | -6/+300 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | |||||
| * | | | | | | | | Struct.new could take a block for defining methods, feedback:smart-pipeline-duration | Lin Jen-Shin | 2016-09-08 | 1 | -2/+1 |
| * | | | | | | | | Split try_merge_period into overlap? and merge: | Lin Jen-Shin | 2016-09-08 | 1 | -7/+9 |
| * | | | | | | | | Just use string interpolation, feedback: | Lin Jen-Shin | 2016-09-07 | 1 | -2/+1 |
| * | | | | | | | | Be more specific since it's not needed to be generic now, | Lin Jen-Shin | 2016-09-06 | 1 | -3/+5 |