| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into faster-diffsfaster-diffs | Jacob Schatz | 2016-07-11 | 1 | -0/+5 |
| |\ | |||||
| | * | Merge branch 'issues-blank-state' into 'master' | Jacob Schatz | 2016-07-07 | 1 | -0/+5 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added blank state to issues ## What does this MR do? Adds new blank state to issues when no issues exist. Part of #18519 ## Screenshots (if relevant)  See merge request !4908 | ||||
| | | * | Updated tests | Phil Hughes | 2016-07-05 | 1 | -0/+5 |
| | | | | |||||
| * | | | Merge branch 'master' into faster-diffs | Douwe Maan | 2016-07-07 | 1 | -6/+6 |
| |\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/helpers/notes_helper.rb # app/views/projects/diffs/_line.html.haml # app/views/projects/diffs/_parallel_view.html.haml # app/views/projects/diffs/_text_file.html.haml # features/steps/shared/diff_note.rb | ||||
| | * | | Display new diff notes and allow creation through the web interface | Douwe Maan | 2016-07-06 | 1 | -6/+6 |
| | |/ | |||||
| * | | fix up tests | Luke "Jared" Bennett | 2016-07-06 | 1 | -9/+8 |
| | | | | | | | | | | | | | Added more exceptions Added handling inline view type | ||||
| * | | Diffs will create button/diff form on demand no on server side | Jacob Schatz | 2016-07-06 | 1 | -8/+6 |
| |/ | |||||
| * | Enable Style/EmptyLines cop, remove redundant onesrubocop/enable-cops-for-empty-lines | Grzegorz Bizon | 2016-07-01 | 1 | -1/+0 |
| | | |||||
| * | Rename Repo -> Repositoryrename-code-to-repo | Stan Hu | 2016-06-21 | 1 | -2/+2 |
| | | |||||
| * | Rename Code tab to Repo | Stan Hu | 2016-06-20 | 1 | -2/+2 |
| | | | | | Closes #18830 | ||||
| * | Render only issues/mr in subnav depends on context | Dmitriy Zaporozhets | 2016-06-10 | 1 | -2/+2 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-2 | Kamil Trzcinski | 2016-06-07 | 1 | -16/+0 |
| |\ | |||||
| | * | Remove prev/next buttons on issues and merge requests18026-consider-removing-issue-merge-request-previous-next-buttons | Alejandro Rodríguez | 2016-06-06 | 1 | -16/+0 |
| | | | | | | | | | The buttons were rarely used and added at least 1 query each on every page load. | ||||
| * | | Rename all `[ci_]commit` to `[ci_]pipeline` in specs and features | Kamil Trzcinski | 2016-06-03 | 2 | -4/+4 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/master' into rename-ci-commit | Kamil Trzcinski | 2016-06-03 | 1 | -6/+10 |
| |\ \ | |/ | |||||
| | * | Fix more tests with new Code tab | Dmitriy Zaporozhets | 2016-06-03 | 1 | -0/+8 |
| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | Update tests to match new Code tab logic | Dmitriy Zaporozhets | 2016-06-03 | 1 | -6/+2 |
| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Rename Ci::Build commit to pipeline | Kamil Trzcinski | 2016-06-03 | 1 | -1/+1 |
| |/ | |||||
| * | Merge branch 'rs-rubocop-nottonot' into 'master' | Dmitriy Zaporozhets | 2016-05-25 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | Enable RSpec/NotToNot cop and auto-correct offenses Ref: https://gitlab.com/gitlab-org/gitlab-ce/issues/17761 See merge request !4267 | ||||
| | * | Enable RSpec/NotToNot cop and auto-correct offensesrs-rubocop-nottonot | Robert Speicher | 2016-05-24 | 1 | -1/+1 |
| | | | | | | | | | Also removes the note from the development/testing.md guide | ||||
| * | | Merge branch 'project-settings' into 'master' | Jacob Schatz | 2016-05-24 | 1 | -1/+1 |
| |\ \ | |/ |/| | | | | | | | | | Project settings UI update  See merge request !4162 | ||||
| | * | Fixed project settings testsproject-settings | Phil Hughes | 2016-05-20 | 1 | -1/+1 |
| | | | |||||
| * | | Fix shortcuts tests | Dmitriy Zaporozhets | 2016-05-16 | 1 | -1/+1 |
| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Modify tests to match new navigation behaviour for project pages | Dmitriy Zaporozhets | 2016-05-16 | 4 | -31/+44 |
| |/ | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Update specs | Douwe Maan | 2016-05-13 | 1 | -6/+6 |
| | | |||||
| * | Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineci-commit-as-pipeline | Kamil Trzcinski | 2016-04-19 | 1 | -1/+1 |
| |\ | | | | | | | | | # Conflicts: # db/schema.rb | ||||
| | * | Fixed tests | Phil Hughes | 2016-04-16 | 1 | -1/+1 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/master' into ci-commit-as-pipeline | Kamil Trzcinski | 2016-04-16 | 2 | -3/+6 |
| |\ \ | |/ | | | | | | | # Conflicts: # db/schema.rb | ||||
| | * | Update click_diff_line | Annabel Dunstone | 2016-04-14 | 1 | -1/+1 |
| | | | |||||
| | * | Load related MRs/branches asynchronously | Yorick Peterse | 2016-04-13 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Currently this works by loading the HAML partials via XHR. While this is not the nicest setup it _is_ the easiest setup using the tools we currently have. Loading this data asynchronously doesn't make loading the related MRs/branches itself faster, it merely ensures that loading the issue itself is not slowed down. Fixes gitlab-org/gitlab-ce#14949 | ||||
| * | | Fix rubocop | Kamil Trzcinski | 2016-04-12 | 1 | -1/+1 |
| | | | |||||
| * | | Fix rest of rspec and spinach tests | Kamil Trzcinski | 2016-04-12 | 2 | -4/+4 |
| | | | |||||
| * | | Fix specs | Kamil Trzcinski | 2016-04-11 | 1 | -1/+1 |
| |/ | |||||
| * | Diff design updates | Annabel Dunstone | 2016-04-07 | 1 | -2/+2 |
| | | |||||
| * | Update diff_comments tests | Annabel Dunstone | 2016-04-07 | 1 | -2/+2 |
| | | |||||
| * | Revert "Merge branch 'new-navigation-prototype' into 'master'" | Jacob Schatz | 2016-04-07 | 1 | -1/+1 |
| | | | | This reverts merge request !3494 | ||||
| * | Updated tests | Phil Hughes | 2016-04-04 | 1 | -1/+1 |
| | | |||||
| * | Commits comment test update | Phil Hughes | 2016-04-04 | 1 | -1/+1 |
| | | |||||
| * | Tests update | Phil Hughes | 2016-04-04 | 1 | -2/+2 |
| | | |||||
| * | Fix some active tab tests that are broken because of 2 level sidebar | Dmitriy Zaporozhets | 2016-04-01 | 1 | -1/+1 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Merge branch 'fix/13928-wrong-iid-of-max-iid' into 'master' | Douwe Maan | 2016-03-15 | 1 | -0/+4 |
| |\ | | | | | | | | | | | | | | | Fixes "iid of max iid" in Issuable sidebar for merged MR Fixes #13928. See merge request !3046 | ||||
| | * | Fixes "iid of max iid" in Issuable sidebar for merged MRfix/13928-wrong-iid-of-max-iid | Rémy Coutable | 2016-03-08 | 1 | -0/+4 |
| | | | | | | | | | Fixes #13928 | ||||
| * | | Cleanup CiCommit and CiBuild | Kamil Trzcinski | 2016-03-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | - Remove all view related methods from Ci::Build and CommitStatus - Remove unused Ci::Commit and Ci::Build methods - Use polymorphism to render different types of CommitStatus | ||||
| * | | Merge branch 'group-activity-separate-tab' into 'master' | Robert Speicher | 2016-03-11 | 1 | -0/+4 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | Move group activity feed to separate page for consistency with dashboard and project pages Fixes #14161. Part of #13480 See merge request !3157 | ||||
| | * | | Move group activity feed to separate page for consistency with dashboard and ↵ | Dmitriy Zaporozhets | 2016-03-10 | 1 | -0/+4 |
| | |/ | | | | | | | | | | | project pages Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Merge branch 'comment-discard-button' into 'master' | Jacob Schatz | 2016-03-11 | 3 | -6/+6 |
| |\ \ | |/ |/| | | | | | | | | | | | | | Added discard button to comment form Also changed the labels on the buttons to better match the action they are completing. Closes #8057 See merge request !3085 | ||||
| | * | Updated tests | Phil Hughes | 2016-03-04 | 3 | -6/+6 |
| | | | |||||
| * | | Remove redundant integration tests | Robert Speicher | 2016-03-07 | 1 | -7/+0 |
| | | | | | | | | | | | | | | | | | | | | | These three tests were essentially checking that adding a note to something updated its `noteable`'s `updated_at` attribute. This is well-tested Rails behavior and we shouldn't feel the need to write an integration test to verify it. At most we should be ensuring that the association definition adds the `touch: true` option, which we now do in Note's unit test. | ||||
| * | | Indicate how much an MR branch diverges from the target branch | Pierre de La Morinerie | 2016-03-03 | 1 | -0/+8 |
| | | | |||||
| * | | Tests: extract a merge_request_path helper | Pierre de La Morinerie | 2016-03-03 | 1 | -4/+7 |
| |/ | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |