Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'patch-23' into 'master' | Sean Packham | 2017-06-02 | 1 | -6/+6 |
|\ | |||||
| * | Rephrase to enhance readability. And some minor grammar. | renzo | 2017-05-29 | 1 | -6/+6 |
* | | Merge branch 'winh-karma-sourcemaps' into 'master' | Filipa Lacerda | 2017-06-02 | 2 | -2/+2 |
|\ \ | |||||
| * | | Use inline source maps for karma (!11815)winh-karma-sourcemaps | winh | 2017-05-31 | 2 | -2/+2 |
* | | | Merge branch '31849-pipeline-real-time-header' into 'master' | Phil Hughes | 2017-06-02 | 27 | -62/+375 |
|\ \ \ | |||||
| * | | | Pipeline show view real time header section | Filipa Lacerda | 2017-06-02 | 27 | -62/+375 |
|/ / / | |||||
* | | | Merge branch '33207-show-delete-option-in-admin-users-page' into 'master' | Grzegorz Bizon | 2017-06-02 | 3 | -1/+7 |
|\ \ \ | |||||
| * | | | Allow admins to delete users from the admin users page | Nick Thomas | 2017-06-01 | 3 | -1/+7 |
* | | | | Merge branch 'update-shell-5-0-5' into 'master' | Sean McGivern | 2017-06-02 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Update GITLAB_SHELL_VERSIONupdate-shell-5-0-5 | Alejandro Rodríguez | 2017-05-31 | 1 | -1/+1 |
* | | | | | Merge branch '32538-url' into 'master' | Tim Zallmann | 2017-06-02 | 1 | -1/+2 |
|\ \ \ \ \ | |||||
| * | | | | | fix IE11 error from sentry32538-url | Simon Knox | 2017-05-19 | 1 | -1/+2 |
* | | | | | | Merge branch 'winh-current-user-filter' into 'master' | Phil Hughes | 2017-06-02 | 11 | -22/+266 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Show current user immediately in issuable filters | Winnie Hellmann | 2017-06-02 | 11 | -22/+266 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'add-new-rake-task-for-gettext' into 'master' | Douwe Maan | 2017-06-01 | 2 | -2/+9 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add new Rake task to simplify the compilation of PO filesadd-new-rake-task-for-gettext | Ruben Davila | 2017-06-01 | 2 | -2/+9 |
* | | | | | | | Merge branch 'bvl-move-gitlab-git-encodinghelper' into 'master' | Robert Speicher | 2017-06-01 | 12 | -75/+73 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Rename `Gitlab::Git::EncodingHelper` to `Gitlab::EncodingHelper` | Bob Van Landuyt | 2017-06-01 | 12 | -75/+73 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'zj-realtime-env-list' into 'master' | Kamil Trzciński | 2017-06-01 | 15 | -57/+259 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Explicitly test etag cache invalidationzj-realtime-env-list | Z.J. van de Weg | 2017-06-01 | 1 | -3/+8 |
| * | | | | | | | Merge branch 'master' into zj-realtime-env-list | Z.J. van de Weg | 2017-06-01 | 657 | -4449/+12690 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Test etag cache key changing value | Z.J. van de Weg | 2017-05-31 | 2 | -2/+19 |
| * | | | | | | | | Merge branch 'master' into zj-realtime-env-list | Z.J. van de Weg | 2017-05-25 | 347 | -1874/+3466 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Restore original comment [ci skip] | Z.J. van de Weg | 2017-05-24 | 1 | -1/+1 |
| * | | | | | | | | | Test etag caching router and incorporate review | Z.J. van de Weg | 2017-05-24 | 5 | -6/+25 |
| * | | | | | | | | | empty | Z.J. van de Weg | 2017-05-22 | 0 | -0/+0 |
| * | | | | | | | | | Remove commented code | Z.J. van de Weg | 2017-05-22 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Guarantees first request is made even when the tab is not visible | Filipa Lacerda | 2017-05-18 | 2 | -0/+4 |
| | * | | | | | | | | | Creates mixin to hold data common to both environments apps | Filipa Lacerda | 2017-05-15 | 3 | -24/+30 |
| | * | | | | | | | | | Remove commented code | Filipa Lacerda | 2017-05-14 | 2 | -3/+0 |
| | * | | | | | | | | | Adds polling function to environments table | Filipa Lacerda | 2017-05-14 | 8 | -53/+174 |
| | * | | | | | | | | | Use etag caching for environments JSON | Z.J. van de Weg | 2017-05-12 | 4 | -1/+40 |
| * | | | | | | | | | | Adds polling function to environments table | Filipa Lacerda | 2017-05-22 | 6 | -55/+175 |
| * | | | | | | | | | | Use etag caching for environments JSON | Z.J. van de Weg | 2017-05-22 | 6 | -3/+43 |
* | | | | | | | | | | | Merge branch 'dm-fix-pipeline-creation-race-condition' into 'master' | Kamil Trzciński | 2017-06-01 | 3 | -14/+9 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Fix race condition between pipeline creation and MR diff_head_sha update | Douwe Maan | 2017-06-01 | 3 | -14/+9 |
* | | | | | | | | | | | Merge branch '32985-show-more-notes-info-at-smaller-breakpoints' into 'master' | Annabel Dunstone Gray | 2017-06-01 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Maintain notes avatar at smaller breakpoint32985-show-more-notes-info-at-smaller-breakpoints | Eric Eastwood | 2017-06-01 | 1 | -2/+2 |
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'yuanfeiz/gitlab-ce-aliyun-backup-provider' into 'master' | Rémy Coutable | 2017-06-01 | 4 | -1/+12 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Add fog-aliyun as backup storage provideryuanfeiz/gitlab-ce-aliyun-backup-provider | Yuanfei Zhu | 2017-06-01 | 4 | -1/+12 |
* | | | | | | | | | | | | Merge branch 'dm-gravatar-username' into 'master' | Sean McGivern | 2017-06-01 | 6 | -12/+41 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Add username parameter to gravatar URL | Douwe Maan | 2017-06-01 | 6 | -12/+41 |
* | | | | | | | | | | | | | Merge branch '24196-protected-variables' into 'master' | Kamil Trzciński | 2017-06-01 | 23 | -43/+342 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Make sure protected can't be null; Test protected!24196-protected-variables | Lin Jen-Shin | 2017-06-01 | 2 | -4/+26 |
| * | | | | | | | | | | | | | Just mention which GitLab version is required | Lin Jen-Shin | 2017-06-01 | 1 | -1/+1 |
| * | | | | | | | | | | | | | Merge two items into one in the doc | Lin Jen-Shin | 2017-06-01 | 1 | -2/+1 |
| * | | | | | | | | | | | | | Merge branch 'master' into '24196-protected-variables' | Kamil Trzciński | 2017-06-01 | 50 | -57/+647 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Add test for Project#protected_for? | Lin Jen-Shin | 2017-06-01 | 1 | -0/+37 |
| * | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into 24196-protected-variables | Lin Jen-Shin | 2017-06-01 | 176 | -831/+3766 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Make sure we're loading the fresh variables | Lin Jen-Shin | 2017-06-01 | 1 | -4/+4 |