Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge remote-tracking branch 'dev/master' into 'master' | Robert Speicher | 2016-02-09 | 4 | -8/+64 | |
|\ \ \ | ||||||
| * \ \ | Merge remote-tracking branch 'origin/master' into ci-permissions | Kamil Trzcinski | 2016-02-04 | 5 | -2/+42 | |
| |\ \ \ | | | |/ | | |/| | | | | | | | | | # Conflicts: # app/views/projects/builds/index.html.haml | |||||
| * | | | Add behaviour tests for build permissions | Kamil Trzcinski | 2016-02-04 | 4 | -8/+56 | |
| | | | | ||||||
| * | | | Rename allow_guest_to_access_builds to public_builds | Kamil Trzcinski | 2016-02-04 | 1 | -0/+8 | |
| | | | | ||||||
* | | | | Allow limited Markdown in Broadcast Messagesrs-broadcast-markdown | Robert Speicher | 2016-02-06 | 2 | -1/+19 | |
| |/ / |/| | | | | | | | | Closes #11853 | |||||
* | | | Update test after changes build page css | Dmitriy Zaporozhets | 2016-02-03 | 1 | -1/+1 | |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | | Merge branch 'support-akismet' into 'master' | Robert Speicher | 2016-02-03 | 3 | -0/+40 | |
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Support Akismet spam checking for creation of issues via API Currently any spam detected by Akismet for non-members via API will be logged in a separate table in the admin page. Closes #5612 See merge request !2266 | |||||
| * | | Use truncate helper on spam logs list | Douglas Barbosa Alexandre | 2016-02-02 | 1 | -6/+16 | |
| | | | ||||||
| * | | Support Akismet spam checking for creation of issues via API | Stan Hu | 2016-02-02 | 3 | -0/+30 | |
| |/ | | | | | | | | | | | | | Currently any spam detected by Akismet by non-members via API will be logged in a separate table in the admin page. Closes #5612 | |||||
* | | Merge remote-tracking branch 'origin/master' into git-raw-workhorse | Jacob Vosmaer | 2016-02-02 | 2 | -0/+27 | |
|\ \ | |/ | ||||||
| * | Render sanitized SVG images | Stan Hu | 2016-02-01 | 2 | -0/+27 | |
| | | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9265 | |||||
* | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵ | Jacob Vosmaer | 2016-02-01 | 26 | -48/+373 | |
|\ \ | |/ | | | | | git-raw-workhorse | |||||
| * | Added tests to emoji search field focus | Phil Hughes | 2016-01-29 | 2 | -0/+7 | |
| | | ||||||
| * | Prevent transient Capybara timeouts during feature testsrs-transient-capybara-timeout | Robert Speicher | 2016-01-28 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | The problem occurred because asset compilation takes a long time, so when the asset cache didn't exist and the first test ran, it would often (randomly) time out during the generation before the actual test even had a chance to run. Now we check if the cache exists before the suite runs, and if not, we manually fire a request to the root URL in order to generate it. This should allow subsequent tests to use the cached assets. | |||||
| * | Merge branch 'issue_2406' into 'master' | Dmitriy Zaporozhets | 2016-01-28 | 3 | -1/+43 | |
| |\ | | | | | | | | | | | | | | | | | | | Show list of forks for a given Project Closes #2406 See merge request !2376 | |||||
| | * | Fix broken spec. | Rubén Dávila | 2016-01-20 | 1 | -1/+3 | |
| | | | ||||||
| | * | Add specs for Forks listing. | Rubén Dávila | 2016-01-20 | 2 | -0/+40 | |
| | | | ||||||
| * | | Merge branch 'issue_5546' into 'master' | Dmitriy Zaporozhets | 2016-01-28 | 5 | -0/+88 | |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Save list sort in a cookie Closes #5546 See merge request !2537 | |||||
| | * | | Make default sorting preference work for Issues and MRs.issue_5546 | Rubén Dávila | 2016-01-22 | 2 | -0/+14 | |
| | | | | ||||||
| | * | | Merge branch 'master' into issue_5546 | Rubén Dávila | 2016-01-22 | 3 | -6/+48 | |
| | |\ \ | ||||||
| | * | | | Make sorting preference reusable for all projects. | Rubén Dávila | 2016-01-22 | 3 | -0/+28 | |
| | | | | | ||||||
| | * | | | Little refactor plus some specs. | Rubén Dávila | 2016-01-21 | 5 | -0/+46 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | James Lopez | 2016-01-27 | 2 | -0/+19 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | fix/unexistent-group-500 | |||||
| | * \ \ \ | Merge branch 'ci/test-build-artifacts-scripts' into 'master' | Douwe Maan | 2016-01-26 | 2 | -0/+19 | |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add tests for clicking a row in build artifacts browser This adds a feature tests for clicking a row, which is handled by javascript event. /cc @ayufan See merge request !2551 | |||||
| | | * | | | | Add tests for clicking a row in build artifacts browserci/test-build-artifacts-scripts | Grzegorz Bizon | 2016-01-22 | 2 | -0/+19 | |
| | | |/ / / | ||||||
| * | | | | | moved and refactored feature based on feedback. Also updated CHANGELOG | James Lopez | 2016-01-27 | 4 | -9/+8 | |
| | | | | | | ||||||
| * | | | | | feature and fix for 500 on group missing | James Lopez | 2016-01-26 | 2 | -0/+9 | |
| |/ / / / | ||||||
| * | | | | Adds base64 background search icon. | Jacob Schatz | 2016-01-24 | 1 | -1/+1 | |
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All inputs of type `search` will have the gray background and search icon centered. Because the search magnifier is a bg image, I had to hide it with `[value=""]`. I added a little javascript to make sure each input always has it's own value. | |||||
| * | | | Fix failing specsfix-comment-on-diff-ajax-loading | Rémy Coutable | 2016-01-21 | 1 | -6/+6 | |
| | | | | ||||||
| * | | | Merge remote-tracking branch 'origin/master' into ↵ | Rémy Coutable | 2016-01-20 | 5 | -1/+48 | |
| |\ \ \ | | |/ / | | | | | | | | | fix-comment-on-diff-ajax-loading | |||||
| | * | | Merge branch 'secret-shortcut-feature' into 'master' | Dmitriy Zaporozhets | 2016-01-20 | 1 | -1/+1 | |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds "t" as a shortcut for find file anywhere See merge request !2507 | |||||
| | | * | | Fixes test to not search whole page for content. | Jacob Schatz | 2016-01-20 | 1 | -1/+1 | |
| | | |/ | ||||||
| | * | | Merge branch 'issue_3749' into 'master' | Douwe Maan | 2016-01-20 | 5 | -0/+47 | |
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | Update Issues/MRs updated_at field when notes are generated Closes #3749 and #9130 See merge request !2493 | |||||
| | | * | Update Issues/MRs updated_at when user leaves comments. | Rubén Dávila | 2016-01-18 | 5 | -0/+47 | |
| | | | | ||||||
| * | | | Fix diff comments loaded by AJAX to load comment with diff in discussion tab | Rémy Coutable | 2016-01-19 | 2 | -0/+42 | |
| |/ / | | | | | | | | | | | | | | | | | | | This commits also fixes two minor issues: - Ensure notes that the current user is not allowed to see are not returned in the AJAX notes loading - Ensure the notes counter badge is decremented of 1 instead of 2 | |||||
| * | | Merge branch 'feature/expose-ci-lint-tool' | Douwe Maan | 2016-01-19 | 4 | -11/+26 | |
| |\ \ | ||||||
| | * | | Remove dropdown containing CI Lint button on builds pagefeature/expose-ci-lint-tool | Grzegorz Bizon | 2016-01-18 | 2 | -3/+3 | |
| | | | | | | | | | | | | | | | | Link to CI Lint on builds page will be a separate button from now on. | |||||
| | * | | Update build artifacts feature tests | Grzegorz Bizon | 2016-01-17 | 1 | -6/+6 | |
| | | | | ||||||
| | * | | Add specs for CI Lint button exposed on a builds page | Grzegorz Bizon | 2016-01-17 | 3 | -5/+20 | |
| | |/ | ||||||
| * | | Improve ux in builds artifacts browser | Grzegorz Bizon | 2016-01-18 | 2 | -3/+3 | |
| |/ | ||||||
| * | Add feature tests for permissions for build artifacts read abilityfeature/allow-artifacts-for-reporters | Grzegorz Bizon | 2016-01-15 | 7 | -12/+57 | |
| | | ||||||
| * | Expand builds namespace for feature tests in spinach | Grzegorz Bizon | 2016-01-15 | 4 | -15/+27 | |
| | | ||||||
* | | Cannot see a raw blob without workhorse | Jacob Vosmaer | 2016-01-28 | 1 | -1/+1 | |
|/ | ||||||
* | Relax constraints for wiki slug | Douglas Barbosa Alexandre | 2016-01-14 | 2 | -15/+0 | |
| | | | | | | | | | | | Since GitHub doesn’t apply these constraints to theirs wiki slug allowing characters like `,`, `:`, `*`, etc, we need to relax our constraints or some wiki pages will not be available after they were imported. For an example the Devise project have a wiki page with the following slug: “How To: Add sign_in, sign_out, and sign_up links to your layout template” | |||||
* | Merge branch 'remove-gray-bg' | Dmitriy Zaporozhets | 2016-01-14 | 1 | -2/+2 | |
|\ | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| * | Fix tests | Dmitriy Zaporozhets | 2016-01-13 | 1 | -2/+2 | |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | Improve readability of artifacts browser `Entry` related code | Grzegorz Bizon | 2016-01-14 | 1 | -1/+1 | |
| | | ||||||
* | | Add specs for endpoint meant to be accelerated by workhorse | Grzegorz Bizon | 2016-01-14 | 2 | -0/+19 | |
| | | ||||||
* | | Add encoding feature tests for builds artifacts browser | Grzegorz Bizon | 2016-01-14 | 2 | -0/+48 | |
| | | ||||||
* | | Add spinach feature specs for build artifacts browser | Grzegorz Bizon | 2016-01-14 | 3 | -0/+67 | |
| | |