Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge branch 'dashboard_issues_and_mr' into 'master' | Dmitriy Zaporozhets | 2014-10-28 | 2 | -3/+53 | |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Dashboard issues and merge request filters Fixes #1597 See merge request !1219 | |||||
| * | | | Assigned merge request should show on dashboard mr overiew feature spec. | Marin Jankovski | 2014-10-27 | 1 | -1/+16 | |
| | | | | ||||||
| * | | | Failing feature for dashboard merge requests when user has authored issues ↵ | Marin Jankovski | 2014-10-27 | 1 | -2/+27 | |
| | | | | | | | | | | | | | | | | on forked project source. | |||||
| * | | | Failing feature for dashboard issues when user has authored issues on ↵ | Marin Jankovski | 2014-10-27 | 1 | -0/+10 | |
| | | | | | | | | | | | | | | | | projects he is not a member of. | |||||
* | | | | Fix raw view for public snippets | Valery Sizov | 2014-10-27 | 2 | -0/+13 | |
|/ / / | ||||||
* | | | fix for public snippet | Valery Sizov | 2014-10-24 | 4 | -1/+32 | |
|/ / | ||||||
* | | Merge branch 'fix-group-member-remove' into 'master' | Dmitriy Zaporozhets | 2014-10-20 | 2 | -2/+28 | |
|\ \ | | | | | | | | | | | | | | | | | | | | | | Fix group member remove Fixes https://github.com/gitlabhq/gitlabhq/issues/8090. See merge request !1196 | |||||
| * | | Add tests for remove group member feature in admin area | Dmitriy Zaporozhets | 2014-10-20 | 2 | -2/+28 | |
| |/ | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | Use :message key, not :error for File::Service. | Ciro Santilli | 2014-10-13 | 3 | -0/+37 | |
|/ | ||||||
* | Merge pull request #7942 from cirosantilli/commit-changes-uppercase | Dmitriy Zaporozhets | 2014-10-13 | 2 | -4/+4 | |
|\ | | | | | Make new and edit file submit more uniform | |||||
| * | Make new and edit file submit more uniform | Ciro Santilli | 2014-10-08 | 2 | -4/+4 | |
| | | ||||||
* | | Fix spinach tests | Dmitriy Zaporozhets | 2014-10-10 | 1 | -1/+1 | |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | Use short_id instead of [0..N] for short version of commit sha | Dmitriy Zaporozhets | 2014-10-10 | 1 | -1/+1 | |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | Snippets: public/internal/private | Valery Sizov | 2014-10-09 | 5 | -4/+45 | |
| | | ||||||
* | | Merge pull request #7979 from mr-vinn/refactor-tasks | Dmitriy Zaporozhets | 2014-10-08 | 5 | -41/+27 | |
|\ \ | | | | | | | Refactor task list tests and coffeescript | |||||
| * | | Refactor task list tests and coffeescript | Vinnie Okada | 2014-10-06 | 5 | -41/+27 | |
| | | | ||||||
* | | | Merge pull request #7992 from cirosantilli/upcate-feature | Robert Schilling | 2014-10-08 | 2 | -2/+2 | |
|\ \ \ | |_|/ |/| | | Upcase missing feature names | |||||
| * | | Upcase missing feature names | Ciro Santilli | 2014-10-07 | 2 | -2/+2 | |
| | | | ||||||
* | | | Snippets: rename public to internal | Valery Sizov | 2014-10-07 | 3 | -4/+4 | |
|/ / | ||||||
* | | Merge branch 'slack_integration' into 'master' | Dmitriy Zaporozhets | 2014-10-06 | 1 | -6/+2 | |
|\ \ | | | | | | | | | | | | | | | | Slack integration See merge request !1151 | |||||
| * | | Use only webhook for slack service integration. | Marin Jankovski | 2014-10-06 | 1 | -6/+2 | |
| | | | ||||||
* | | | Merge pull request #7964 from mr-vinn/task-lists | Marin Jankovski | 2014-10-06 | 7 | -0/+170 | |
|\ \ \ | | |/ | |/| | Add task lists to issues and merge requests | |||||
| * | | Add Spinach tests for task lists | Vinnie Okada | 2014-10-06 | 7 | -0/+170 | |
| |/ | ||||||
* | | Preventing some duplication in MR feature tests by adding a different comment. | Marin Jankovski | 2014-10-06 | 2 | -9/+15 | |
|/ | ||||||
* | Make Spinach test names consistent | Ciro Santilli | 2014-10-05 | 60 | -56/+56 | |
| | | | | | | | - do not add Feature to feature titles - titleize feature titles - put steps on the same path as .feature files - make feature titles match their path | |||||
* | Add Pushover service integration | Sullivan SENECHAL | 2014-10-03 | 2 | -0/+29 | |
| | | | | That introduce select field type for services options. | |||||
* | Merge branch 'cirosantilli-factor-commit-msg-textarea' | Dmitriy Zaporozhets | 2014-10-03 | 1 | -1/+1 | |
|\ | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/views/projects/edit_tree/show.html.haml | |||||
| * | Merge branch 'factor-commit-msg-textarea' of ↵ | Dmitriy Zaporozhets | 2014-10-03 | 1 | -1/+1 | |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/cirosantilli/gitlabhq into cirosantilli-factor-commit-msg-textarea Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/views/projects/blob/_remove.html.haml | |||||
| | * | Factor commit message textareas. | Ciro Santilli | 2014-10-02 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge pull request #7947 from cirosantilli/rm-assign-without-effect | Robert Schilling | 2014-10-03 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Remove assignment without effect. | |||||
| * | | | Remove assignment without effect. | Ciro Santilli | 2014-10-03 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Upgrade to Font Awesome v4.2 | Sullivan SENECHAL | 2014-10-03 | 1 | -4/+4 | |
| |/ / |/| | | ||||||
* | | | Add parenthesis to function def with arguments. | Ciro Santilli | 2014-10-03 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge pull request #7834 from cirosantilli/rm-empty-eq | Robert Schilling | 2014-10-03 | 1 | -3/+0 | |
|\ \ | | | | | | | Remove test line without effect because no should. | |||||
| * | | Remove test line without effect because no should. | Ciro Santilli | 2014-09-23 | 1 | -3/+0 | |
| | | | ||||||
* | | | Merge branch 'fix-500-admin-user-page' into 'master' | Dmitriy Zaporozhets | 2014-10-02 | 2 | -0/+25 | |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | Fix 500 admin user page See merge request !1147 | |||||
| * | | | Add test for broken admin user page | Dmitriy Zaporozhets | 2014-10-02 | 2 | -0/+25 | |
| | |/ | |/| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | | Comment random failing test | Dmitriy Zaporozhets | 2014-10-02 | 1 | -12/+14 | |
|/ / | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | Merge pull request #7904 from cirosantilli/titleize-actions | Robert Schilling | 2014-10-01 | 4 | -22/+22 | |
|\ \ | | | | | | | Titleize blob action buttons. [failure unrelated] | |||||
| * | | Titleize blob action buttons. | Ciro Santilli | 2014-09-30 | 4 | -22/+22 | |
| | | | ||||||
* | | | Merge pull request #7930 from cirosantilli/group-test-up | Robert Schilling | 2014-10-01 | 1 | -0/+0 | |
|\ \ \ | | | | | | | | | Move group feature step to match test location [failure unrelated] | |||||
| * | | | Move group feature step to match test location | Ciro Santilli | 2014-10-01 | 1 | -0/+0 | |
| | | | | ||||||
* | | | | Try wear_merged! without argument | Dmitriy Zaporozhets | 2014-10-01 | 1 | -1/+1 | |
|/ / / | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | | Add a feature for readme on project show page. | Marin Jankovski | 2014-09-30 | 2 | -7/+22 | |
|/ / | ||||||
* | | Merge pull request #7889 from cirosantilli/rm-def-project | Robert Schilling | 2014-09-30 | 6 | -24/+0 | |
|\ \ | | | | | | | Remove def project from tests that inherit it. | |||||
| * | | Remove def project from tests that inherit it. | Ciro Santilli | 2014-09-28 | 6 | -24/+0 | |
| | | | ||||||
* | | | Merge pull request #7862 from cirosantilli/test-change-file | Dmitriy Zaporozhets | 2014-09-29 | 2 | -4/+102 | |
|\ \ \ | | | | | | | | | Add web UI file CRUD tests. | |||||
| * | | | Add web UI file CRUD tests. | Ciro Santilli | 2014-09-26 | 2 | -4/+102 | |
| |/ / | | | | | | | | | | me/ciro/bak/git/cirosantilli.com/web' | |||||
* | | | Add tests for commits graph | Dmitriy Zaporozhets | 2014-09-29 | 2 | -1/+16 | |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | | Fix spinach feature | Dmitriy Zaporozhets | 2014-09-26 | 1 | -3/+4 | |
|/ / | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> |