Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed timeago specsformat-timeago-date | Phil Hughes | 2017-02-13 | 2 | -4/+4 |
| | |||||
* | Formats timeago dates to be more friendly | Phil Hughes | 2017-02-10 | 2 | -1/+5 |
| | | | | | | | | Formats the timeago timestamps to be a short date. This will only be visible on slower connections whilst the JS is loading, after the JS has loaded it will be turned into a timeago string Closes #27537 | ||||
* | Merge branch 'user-dropdown-settings' into 'master' | Alfredo Sumaran | 2017-02-10 | 1 | -1/+1 |
|\ | | | | | | | | | Make min width smaller for user settings See merge request !9112 | ||||
| * | Make min width smaller for user settingsuser-dropdown-settings | Annabel Dunstone Gray | 2017-02-09 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'issue_27855' into 'master' | Rémy Coutable | 2017-02-10 | 1 | -5/+6 |
|\ \ | | | | | | | | | | | | | | | | | | | Fix admin_labels_spec.rb transient failure Closes #27855 See merge request !9135 | ||||
| * | | Fix admin_labels_spec.rb transient failureissue_27855 | Felipe Artur | 2017-02-10 | 1 | -5/+6 |
| | | | |||||
* | | | Merge branch '27955-mr-notification-use-pipeline-language' into 'master' | Filipa Lacerda | 2017-02-10 | 2 | -2/+6 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Show Pipeline(not Job) in MR CI status desktop notification Closes #27955 See merge request !9122 | ||||
| * \ \ | Merge branch 'master' into 27955-mr-notification-use-pipeline-language | Filipa Lacerda | 2017-02-10 | 5 | -9/+31 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Remove a transient failure from spec/requests/api/groups_spec.rb Update PROCESS.md Update MergeRequest API state_event option documentation | ||||
| * \ \ \ | Merge branch 'master' into 27955-mr-notification-use-pipeline-language27955-mr-notification-use-pipeline-language | Filipa Lacerda | 2017-02-10 | 4 | -4/+4 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * master: Rename issuable to IssueBase | ||||
| * | | | | | Show Pipeline(not Job) in MR desktop notification | Eric Eastwood | 2017-02-10 | 2 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/27955 | ||||
* | | | | | | Merge branch 'test-for-current-gitlab-ci-yml' into 'master' | Rémy Coutable | 2017-02-10 | 1 | -0/+10 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | Make sure our current .gitlab-ci.yml is valid See merge request !9125 | ||||
| * | | | | | Make sure our current .gitlab-ci.yml is validtest-for-current-gitlab-ci-yml | Lin Jen-Shin | 2017-02-10 | 1 | -0/+10 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This could prevent errors described in: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8970 Everything we're using right now, should be valid of course. | ||||
* | | | | | Merge branch 'rs-issue-27974' into 'master' | Rémy Coutable | 2017-02-10 | 2 | -3/+24 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | Remove a transient failure from spec/requests/api/groups_spec.rb Closes #27974 See merge request !9116 | ||||
| * | | | | Remove a transient failure from spec/requests/api/groups_spec.rbrs-issue-27974 | Robert Speicher | 2017-02-09 | 2 | -3/+24 |
| | | | | | |||||
* | | | | | Merge branch 'jej-update-mr-state-event-docs' into 'master' | Sean McGivern | 2017-02-10 | 2 | -5/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update MergeRequest API state_event option documentation Closes #25566 See merge request !8077 | ||||
| * | | | | | Update MergeRequest API state_event option documentationjej-update-mr-state-event-docs | James Edwards-Jones | 2017-02-09 | 2 | -5/+6 |
| | | | | | | |||||
* | | | | | | Merge branch 'dz-patch-1' into 'master' | Dmitriy Zaporozhets | 2017-02-10 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | Add clarification to RC1 date See merge request !9104 | ||||
| * | | | | | Update PROCESS.mddz-patch-1 | Dmitriy Zaporozhets | 2017-02-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | | | Merge branch 'zj-rename-issuable-issue-base' into 'master' | Rémy Coutable | 2017-02-10 | 4 | -4/+4 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | Rename issuable to IssueBase See merge request !9127 | ||||
| * | | | | | Rename issuable to IssueBasezj-rename-issuable-issue-base | Z.J. van de Weg | 2017-02-08 | 4 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Given the the Issuable class will soon also have to support MRs this signals that it can only be used by issues. | ||||
* | | | | | | Merge branch 'protected-branch-dropdown-titles' into 'master' | Jacob Schatz | 2017-02-10 | 3 | -4/+20 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | Added header to protected branches access dropdowns See merge request !8774 | ||||
| * | | | | | Added header to protected branches access dropdownsprotected-branch-dropdown-titles | Phil Hughes | 2017-01-26 | 3 | -4/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | CE part of https://gitlab.com/gitlab-org/gitlab-ee/issues/1294 | ||||
* | | | | | | Merge branch 'copy-branch-to-clipboard' into 'master' | Filipa Lacerda | 2017-02-09 | 2 | -0/+5 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | Allow copying a created branch name to the clipboard. See merge request !9103 | ||||
| * | | | | | Allow copying a created branch name to the clipboard. | Glenn Sayers | 2017-02-09 | 2 | -0/+5 |
| | | | | | | |||||
* | | | | | | Merge branch 'revert-0ef587b6' into 'master' | Filipa Lacerda | 2017-02-09 | 25 | -41/+94 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Responsive title in diffs inline, side by side, with and without sidebar Closes #25709 See merge request !8707 | ||||
| * | | | | | | Fix expand_collapse_diffs specsrevert-0ef587b6 | Annabel Dunstone Gray | 2017-02-09 | 1 | -6/+6 |
| | | | | | | | |||||
| * | | | | | | Reduce file header padding | Annabel Dunstone Gray | 2017-02-08 | 1 | -3/+2 |
| | | | | | | | |||||
| * | | | | | | Align file header items while keeping collapse functionality | Annabel Dunstone Gray | 2017-02-08 | 3 | -4/+16 |
| | | | | | | | |||||
| * | | | | | | Use a new class to keep old behavior | Filipa Lacerda | 2017-02-08 | 21 | -36/+36 |
| | | | | | | | |||||
| * | | | | | | Revert "Merge branch 'revert-a91ff32b' into 'master'" | Filipa Lacerda | 2017-02-08 | 5 | -4/+46 |
| | | | | | | | | | | | | | | | | | | | | | This reverts merge request !8688 | ||||
* | | | | | | | Merge branch '27943-contribution-list-on-profile-page-is-aligned-right' into ↵ | Annabel Dunstone Gray | 2017-02-09 | 2 | -0/+6 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix contribution activity alignment Closes #27943 See merge request !9101 | ||||
| * | | | | | | | Fix contribution activity alignment27943-contribution-list-on-profile-page-is-aligned-right | Clement Ho | 2017-02-09 | 2 | -0/+6 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'rs-gemfetcher-cop-spec' into 'master' | Sean McGivern | 2017-02-09 | 4 | -19/+76 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a spec for our custom GemFetcher cop See merge request !9076 | ||||
| * | | | | | | | | Add a spec for our custom GemFetcher coprs-gemfetcher-cop-spec | Robert Speicher | 2017-02-09 | 4 | -19/+76 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'upgrade-webpack-v2.2' into 'master' | Alfredo Sumaran | 2017-02-09 | 4 | -20/+35 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade to webpack v2.2.1 See merge request !9078 | ||||
| * | | | | | | | | add CHANGELOG.md entry for !9078upgrade-webpack-v2.2 | Mike Greiling | 2017-02-09 | 1 | -0/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | approve new dependencies | Mike Greiling | 2017-02-09 | 1 | -0/+12 |
| | | | | | | | | | |||||
| * | | | | | | | | update karma deps to work with webpack 2 | Mike Greiling | 2017-02-09 | 1 | -2/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | upgrade to webpack 2.2.x | Mike Greiling | 2017-02-09 | 2 | -18/+17 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch '27726-fix-dropdown-width-in-admin-project-page' into 'master' | Filipa Lacerda | 2017-02-09 | 2 | -1/+8 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes dropdown width in admin project page Closes #27726 See merge request !9002 | ||||
| * | | | | | | | | | adds max-width only for new filter dropdown27726-fix-dropdown-width-in-admin-project-page | Nur Rony | 2017-02-09 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | adds changelog | Nur Rony | 2017-02-09 | 1 | -0/+4 |
| | | | | | | | | | | |||||
| * | | | | | | | | | fixes dropdown width in admin project page | Nur Rony | 2017-02-09 | 1 | -1/+4 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'build-notification-null' into 'master' | Filipa Lacerda | 2017-02-09 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a null check to build notifications Closes #27948 See merge request !9108 | ||||
| * | | | | | | | | | | Adds a null check to build notifications | Phil Hughes | 2017-02-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #27948 | ||||
* | | | | | | | | | | | Merge branch 'update-rspec_profiling' into 'master' | Rémy Coutable | 2017-02-09 | 2 | -5/+5 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the rspec_profiling gem to 0.0.5 Closes #27517 See merge request !9094 | ||||
| * | | | | | | | | | | | Update the rspec_profiling gem to 0.0.5update-rspec_profiling | Rémy Coutable | 2017-02-09 | 2 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | | | | | | | | | Merge branch 'upgrade-babel-v6' into 'master' | Alfredo Sumaran | 2017-02-09 | 6 | -10/+19 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade from Babel 5 to Babel 6 See merge request !9072 | ||||
| * | | | | | | | | | | | add CHANGELOG.md entry for !9072 | Mike Greiling | 2017-02-09 | 1 | -0/+4 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | approve MIT license for wordwrap submodule | Mike Greiling | 2017-02-09 | 1 | -0/+6 |
| | | | | | | | | | | | |